diff --git a/test/built-ins/DataView/prototype/getFloat32/length.js b/test/built-ins/DataView/prototype/getFloat32/length.js
index e349ab252e758a342f579b676b6b52b37883e28c..9d1795d00ae0c042af2c8998a712b3f042b14097 100755
--- a/test/built-ins/DataView/prototype/getFloat32/length.js
+++ b/test/built-ins/DataView/prototype/getFloat32/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.getfloat32
description: >
DataView.prototype.getFloat32.length is 1.
info: >
diff --git a/test/built-ins/DataView/prototype/getFloat64/length.js b/test/built-ins/DataView/prototype/getFloat64/length.js
index 5e2cb57f8c9c1861222fb8316c7e6ef6ba061fba..0bac50622a2f1fbdb8fd17f9c151d972cd9aa2fd 100755
--- a/test/built-ins/DataView/prototype/getFloat64/length.js
+++ b/test/built-ins/DataView/prototype/getFloat64/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.getfloat64
description: >
DataView.prototype.getFloat64.length is 1.
info: >
diff --git a/test/built-ins/DataView/prototype/getInt16/length.js b/test/built-ins/DataView/prototype/getInt16/length.js
index cf0e589a7698ea3ec87502c5f3e33619f8309041..5cd9bb5b9123ec3e37ba854c415bd48bf802f2f7 100755
--- a/test/built-ins/DataView/prototype/getInt16/length.js
+++ b/test/built-ins/DataView/prototype/getInt16/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.getint16
description: >
DataView.prototype.getInt16.length is 1.
info: >
diff --git a/test/built-ins/DataView/prototype/getInt32/length.js b/test/built-ins/DataView/prototype/getInt32/length.js
index e8651ec7f73860db2a5f9c4200d86a1faee8cb7d..e6058929f80a581baa0ff6d2b090a1bcc1cf6d0f 100755
--- a/test/built-ins/DataView/prototype/getInt32/length.js
+++ b/test/built-ins/DataView/prototype/getInt32/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.getint32
description: >
DataView.prototype.getInt32.length is 1.
info: >
diff --git a/test/built-ins/DataView/prototype/getUint16/length.js b/test/built-ins/DataView/prototype/getUint16/length.js
index f092ec2b5b38b6af15f97f62ed723ab77b1c983b..307e4d568a74288013eb4213813f0e6552a751b1 100755
--- a/test/built-ins/DataView/prototype/getUint16/length.js
+++ b/test/built-ins/DataView/prototype/getUint16/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.getuint16
description: >
DataView.prototype.getUint16.length is 1.
info: >
diff --git a/test/built-ins/DataView/prototype/getUint32/length.js b/test/built-ins/DataView/prototype/getUint32/length.js
index fd7f821218fd90b73842604cd95284878809f153..6a022fa9e3320a9197cd0ebc2b926d822cd07510 100755
--- a/test/built-ins/DataView/prototype/getUint32/length.js
+++ b/test/built-ins/DataView/prototype/getUint32/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.getuint32
description: >
DataView.prototype.getUint32.length is 1.
info: >
diff --git a/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
index 22db986e2e2f1341bd908c6ae46d29d0b7309656..32d29e559381826b62e00fd32397b21e21d5eefd 100755
--- a/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.13
+id: sec-dataview.prototype.setfloat32
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setFloat32/length.js b/test/built-ins/DataView/prototype/setFloat32/length.js
index 832fd7359059f94b556892ace49a03ee12229520..63f7d4d51474ba09cd09da85b3f30b05efa0b55e 100755
--- a/test/built-ins/DataView/prototype/setFloat32/length.js
+++ b/test/built-ins/DataView/prototype/setFloat32/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.setfloat32
description: >
DataView.prototype.setFloat32.length is 2.
info: >
diff --git a/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
index d61395a754971215966c58cc3ce522f04827c432..5bbd3a02a7f6d0122de0df78f2eaaa91e98fc5f2 100755
--- a/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.13
+id: sec-dataview.prototype.setfloat32
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
index 91e9c9d8eaf8d59c00451ddfaf051ec5c7c99727..0d5aee7e6729f7181aa3ead4c84adf54ff4774d6 100755
--- a/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.14
+id: sec-dataview.prototype.setfloat64
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setFloat64/length.js b/test/built-ins/DataView/prototype/setFloat64/length.js
index df566d6d3aa824138c981520f47addd50a89507e..cbe15b0edf2b24293226a7c33ccdf7c556ce2db6 100755
--- a/test/built-ins/DataView/prototype/setFloat64/length.js
+++ b/test/built-ins/DataView/prototype/setFloat64/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.setfloat64
description: >
DataView.prototype.setFloat64.length is 2.
info: >
diff --git a/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
index 2c7977ec228ee71bcd51f351ef425fd69d4f1597..3d02fa21d1d23f32a3c3ca12210db941cb060dc8 100755
--- a/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.14
+id: sec-dataview.prototype.setfloat64
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
index 003e3445f9a0a653c646a13357cb8ac70516f68f..1d6e3431294fa87df116e6bb2a730ceaa2b0c8f5 100755
--- a/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.16
+id: sec-dataview.prototype.setint16
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt16/length.js b/test/built-ins/DataView/prototype/setInt16/length.js
index 7685da563ec689477d7e9c132e0a770c2dd2a5cc..e4e2f7abb8b339d66b7241d908593365d10e3a36 100755
--- a/test/built-ins/DataView/prototype/setInt16/length.js
+++ b/test/built-ins/DataView/prototype/setInt16/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.setint16
description: >
DataView.prototype.setInt16.length is 2.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
index 06fe171772eac8d8033460b6f6fd98f019ce7205..5a8feb030925828b045ce69c5450d998ab732d4e 100755
--- a/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.16
+id: sec-dataview.prototype.setint16
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
index 5fbe570feda8b7441853074c5ed65878442e4b7c..0e12094e784bc3567c05e5daa64bc3c902f45bef 100755
--- a/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.17
+id: sec-dataview.prototype.setint32
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt32/length.js b/test/built-ins/DataView/prototype/setInt32/length.js
index 5150739dfbd308d3bd61c18879213b797e1faab9..3da8d320b30aedb7721d9a3e984f884dd6993f65 100755
--- a/test/built-ins/DataView/prototype/setInt32/length.js
+++ b/test/built-ins/DataView/prototype/setInt32/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.setint32
description: >
DataView.prototype.setInt32.length is 2.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
index abc10a45d849ed895d72b98457f28055bfc78d1e..5b8b4b7e46186a2c933438656a008b10428d5962 100755
--- a/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.17
+id: sec-dataview.prototype.setint32
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
index b785124f26305144609774d0dbda5031ece43bfc..3eaa58c2075f7ecea41230dc222a7362f2bbd431 100755
--- a/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.15
+id: sec-dataview.prototype.setint8
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
index d641fad7b8fd65c390e7ba8e9e88af2bdcc6eb7f..7ef98eefb6cbe1ec6fae31af00b742a71cccc71f 100755
--- a/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.15
+id: sec-dataview.prototype.setint8
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
index 8baacbd1f10903a3a1659930e7202c6bdf9dc1c1..6b1f7049e4aa9b64a8d6de2963b03783d672ee2f 100755
--- a/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.19
+id: sec-dataview.prototype.setuint16
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint16/length.js b/test/built-ins/DataView/prototype/setUint16/length.js
index 541d8f1f17f0a512a745bace79d0f1567c63ba52..4720121d295257819354489a02618c270a898d9a 100755
--- a/test/built-ins/DataView/prototype/setUint16/length.js
+++ b/test/built-ins/DataView/prototype/setUint16/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.setuint16
description: >
DataView.prototype.setUint16.length is 2.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
index 8296c259645d6eb105a79112e4cae4def65ddd54..16492a26e1a3d8bdf6d3a4b640b5be71811fd515 100755
--- a/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.19
+id: sec-dataview.prototype.setuint16
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
index 618bf081d4afc1f420cefaf422b49e13fc9886b2..ccbcb4dd184d9e93fb1f08142b4569f69924f08b 100755
--- a/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.20
+id: sec-dataview.prototype.setuint32
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint32/length.js b/test/built-ins/DataView/prototype/setUint32/length.js
index ebbf330cfe64590470997d55661ca418c4ce2da8..0017fd1b6f7eb2ec586adf5fbfe7d3abf249a966 100755
--- a/test/built-ins/DataView/prototype/setUint32/length.js
+++ b/test/built-ins/DataView/prototype/setUint32/length.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-dataview.prototype.setuint32
description: >
DataView.prototype.setUint32.length is 2.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
index bc99e21fdf6b6ba52160a64aa58f8bc74ffe7c97..b9afbbb46163cb0ee9100d96971af2d11b91090d 100755
--- a/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.20
+id: sec-dataview.prototype.setuint32
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
index 2b3c42f5395d700698f4964581c43c2abffed5d7..5992764a4894a4d1894d0d24fd0ddd3c1cf2e741 100755
--- a/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.18
+id: sec-dataview.prototype.setuint8
description: >
Throws a RangeError if the index is negative or non-integral number.
info: >
diff --git a/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
index fb85d2a00422d53ae29b3520e02098d73785d77e..6ee93d1daf5fb8d5727a2aaece3de66c8d045430 100755
--- a/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 24.2.4.18
+id: sec-dataview.prototype.setuint8
description: >
Index bounds checks are performed after value conversion.
info: >
diff --git a/test/built-ins/Object/entries/exception-during-enumeration.js b/test/built-ins/Object/entries/exception-during-enumeration.js
index 5066c8c7af8b81855657cfcb024f035df512649d..9848e8b1ba657e9add139c2cf1d379f3488eecf3 100644
--- a/test/built-ins/Object/entries/exception-during-enumeration.js
+++ b/test/built-ins/Object/entries/exception-during-enumeration.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries should terminate if getting a value throws an exception
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/exception-not-object-coercible.js b/test/built-ins/Object/entries/exception-not-object-coercible.js
index 0a434aa3bb7f29e6c2248ece56031f021675ee66..abd03977e9cf1339f68b46fe40c9203d44153d97 100644
--- a/test/built-ins/Object/entries/exception-not-object-coercible.js
+++ b/test/built-ins/Object/entries/exception-not-object-coercible.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries should fail if given a null or undefined value
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/function-length.js b/test/built-ins/Object/entries/function-length.js
index a0b1b6a36459ed114324f6c80fc54621237b80c2..a140f33d2d5fcba4cae1e9d5c87140902632ab09 100644
--- a/test/built-ins/Object/entries/function-length.js
+++ b/test/built-ins/Object/entries/function-length.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries should have length 1
-es7id: pending
author: Jordan Harband
includes: [propertyHelper.js]
---*/
diff --git a/test/built-ins/Object/entries/function-name.js b/test/built-ins/Object/entries/function-name.js
index 4fd68f9f76ecd8ddea5587676dfa19390379eca8..1a56db9ed87d474d850b89252b4682fb8c95fdc8 100644
--- a/test/built-ins/Object/entries/function-name.js
+++ b/test/built-ins/Object/entries/function-name.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries should have name property with value 'entries'
-es7id: pending
author: Jordan Harband
includes: [propertyHelper.js]
---*/
diff --git a/test/built-ins/Object/entries/function-property-descriptor.js b/test/built-ins/Object/entries/function-property-descriptor.js
index a8109c0b81a50ed4591cc0e6dddec044abfacddf..be146e648b6d8cdaf7052fcc774a3f040065df02 100644
--- a/test/built-ins/Object/entries/function-property-descriptor.js
+++ b/test/built-ins/Object/entries/function-property-descriptor.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries should be writable, non-enumerable, and configurable
-es7id: pending
author: Jordan Harband
includes: [propertyHelper.js]
---*/
diff --git a/test/built-ins/Object/entries/getter-adding-key.js b/test/built-ins/Object/entries/getter-adding-key.js
index d6a7217769f3f3713b87867e679392b403d68386..cec77a4f6a6cd90dace7dcad556200b9a79fac57 100644
--- a/test/built-ins/Object/entries/getter-adding-key.js
+++ b/test/built-ins/Object/entries/getter-adding-key.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries does not see a new element added by a getter that is hit during iteration
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js b/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
index ae8407d5aaade1b65f8d04dd28d7f0edd8aceb79..2be311b01a74228a9f9626f660a8599cc48b0cd5 100644
--- a/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
+++ b/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries does not see an element made non-enumerable by a getter that is hit during iteration
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/getter-removing-future-key.js b/test/built-ins/Object/entries/getter-removing-future-key.js
index 5429ec4e42c11681ef3c3ecb60ff765332af4ae7..83206cfb46a53c175e06d436c10a412e9d2d652f 100644
--- a/test/built-ins/Object/entries/getter-removing-future-key.js
+++ b/test/built-ins/Object/entries/getter-removing-future-key.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries does not see an element removed by a getter that is hit during iteration
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/inherited-properties-omitted.js b/test/built-ins/Object/entries/inherited-properties-omitted.js
index 0b9a55c18d3c3b1c56b4ebcd2f29482c1601725d..5d0f3cd1eff378f45e4ad4fb9df16a57bff84ecf 100644
--- a/test/built-ins/Object/entries/inherited-properties-omitted.js
+++ b/test/built-ins/Object/entries/inherited-properties-omitted.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries does not see inherited properties.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/observable-operations.js b/test/built-ins/Object/entries/observable-operations.js
index 1ace44358c53532ac41d280c93a73d1fecb5785f..f8916c285d591f10e0b50a0ea6ebccb1979222fb 100644
--- a/test/built-ins/Object/entries/observable-operations.js
+++ b/test/built-ins/Object/entries/observable-operations.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries should perform observable operations in the correct order
-es7id: pending
author: Jordan Harband
features: [Proxy]
---*/
diff --git a/test/built-ins/Object/entries/primitive-booleans.js b/test/built-ins/Object/entries/primitive-booleans.js
index d7f961c458f635a4beee74d769bd594a25bb9324..fec6d5c80da281762e9ef8226e88d50e4f546f4b 100644
--- a/test/built-ins/Object/entries/primitive-booleans.js
+++ b/test/built-ins/Object/entries/primitive-booleans.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries accepts boolean primitives.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/primitive-numbers.js b/test/built-ins/Object/entries/primitive-numbers.js
index fb5649923b6928a2cf5d11aadda4454e8180c7d3..84032ae0b52caf594fadf89178f69fe384429ed6 100644
--- a/test/built-ins/Object/entries/primitive-numbers.js
+++ b/test/built-ins/Object/entries/primitive-numbers.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries accepts number primitives.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/primitive-strings.js b/test/built-ins/Object/entries/primitive-strings.js
index 5c3ab5d16f74f24997e00cc5d976819f5e6f2318..440ff0666f3e3c45cd568188fa73638e15afb59d 100644
--- a/test/built-ins/Object/entries/primitive-strings.js
+++ b/test/built-ins/Object/entries/primitive-strings.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries accepts string primitives.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/primitive-symbols.js b/test/built-ins/Object/entries/primitive-symbols.js
index c105a6293369c05b92feebe0cc89fb9b98bf19fb..4ab366bd5a59e12fa8acf4ba14b47a7d699be478 100644
--- a/test/built-ins/Object/entries/primitive-symbols.js
+++ b/test/built-ins/Object/entries/primitive-symbols.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries accepts Symbol primitives.
-es7id: pending
author: Jordan Harband
features: [Symbol]
---*/
diff --git a/test/built-ins/Object/entries/symbols-omitted.js b/test/built-ins/Object/entries/symbols-omitted.js
index 7268e9f2db56f98e2081932d13c58fe156f19cc9..97e7a5a225ecc94ed1b16e7338cd687506de558d 100644
--- a/test/built-ins/Object/entries/symbols-omitted.js
+++ b/test/built-ins/Object/entries/symbols-omitted.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: Object.entries does not include Symbol keys.
-es7id: pending
author: Jordan Harband
features: [Symbol]
---*/
diff --git a/test/built-ins/Object/entries/tamper-with-global-object.js b/test/built-ins/Object/entries/tamper-with-global-object.js
index 0ba60fcb4c3f712294cfdc1780aa0cb79343c4bd..6e17a287d7f7ebf55b549168aeff70929482d220 100644
--- a/test/built-ins/Object/entries/tamper-with-global-object.js
+++ b/test/built-ins/Object/entries/tamper-with-global-object.js
@@ -2,9 +2,9 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: >
Object.entries should not have its behavior impacted by modifications to the global property Object
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/entries/tamper-with-object-keys.js b/test/built-ins/Object/entries/tamper-with-object-keys.js
index b2fc255a11dbb678eec8040f78ab0838b9649f27..4170bf382cf9ce6ce9f8503436578dc7aac61abc 100644
--- a/test/built-ins/Object/entries/tamper-with-object-keys.js
+++ b/test/built-ins/Object/entries/tamper-with-object-keys.js
@@ -2,9 +2,9 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.entries
description: >
Object.entries should not have its behavior impacted by modifications to Object.keys
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/exception-during-enumeration.js b/test/built-ins/Object/values/exception-during-enumeration.js
index eabe7d4316aefd523a3184542932c941081fa1b1..b4d201fa907a5eafad97ddfcf90df37384343ebf 100644
--- a/test/built-ins/Object/values/exception-during-enumeration.js
+++ b/test/built-ins/Object/values/exception-during-enumeration.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values should terminate if getting a value throws an exception
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/exception-not-object-coercible.js b/test/built-ins/Object/values/exception-not-object-coercible.js
index f23af2c67b596eaa295c5288cc64e2e8df881d6c..83a7ab9b29e268a3351ca0934154fbc3e3e56da2 100644
--- a/test/built-ins/Object/values/exception-not-object-coercible.js
+++ b/test/built-ins/Object/values/exception-not-object-coercible.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values should fail if given a null or undefined value
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/function-length.js b/test/built-ins/Object/values/function-length.js
index d8129b9dbf21938ee791cb2caf5bca0caf892da1..58a57200186e838c805e47946eeb09ca68b6e6dc 100644
--- a/test/built-ins/Object/values/function-length.js
+++ b/test/built-ins/Object/values/function-length.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values should have length 1
-es7id: pending
author: Jordan Harband
includes: [propertyHelper.js]
---*/
diff --git a/test/built-ins/Object/values/function-name.js b/test/built-ins/Object/values/function-name.js
index 388f91d2205a9be12ca05a27d9655cf1d5ea617c..33b7a097509d4f76a530824c46438825e64d5317 100644
--- a/test/built-ins/Object/values/function-name.js
+++ b/test/built-ins/Object/values/function-name.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values should have name property with value 'values'
-es7id: pending
author: Jordan Harband
includes: [propertyHelper.js]
---*/
diff --git a/test/built-ins/Object/values/function-property-descriptor.js b/test/built-ins/Object/values/function-property-descriptor.js
index c6d285cc8b7d8ddf020ae1ced094e78d986e8803..a421d40c57d003bff0616b1fbd5046ec7aa620fd 100644
--- a/test/built-ins/Object/values/function-property-descriptor.js
+++ b/test/built-ins/Object/values/function-property-descriptor.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values should be writable, non-enumerable, and configurable
-es7id: pending
author: Jordan Harband
includes: [propertyHelper.js]
---*/
diff --git a/test/built-ins/Object/values/getter-adding-key.js b/test/built-ins/Object/values/getter-adding-key.js
index dfb9752eeb6b7ef5214507fb88a75e95ea971238..01a5a41615376c0f3de314109577ba48a4ab54cc 100644
--- a/test/built-ins/Object/values/getter-adding-key.js
+++ b/test/built-ins/Object/values/getter-adding-key.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values does not see a new element added by a getter that is hit during iteration
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js b/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
index 5dd452fa4cd4795de9af733634b132f38b318bce..d7943655abc4a5717b53db431ca9852e547f3a27 100644
--- a/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
+++ b/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values does not see an element made non-enumerable by a getter that is hit during iteration
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/getter-removing-future-key.js b/test/built-ins/Object/values/getter-removing-future-key.js
index 60fd230b5a8e1bbdae6a08c9bac226933633b218..53b7d6b43ab11e5be75bd04e6eeb0581a56a2a16 100644
--- a/test/built-ins/Object/values/getter-removing-future-key.js
+++ b/test/built-ins/Object/values/getter-removing-future-key.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values does not see an element removed by a getter that is hit during iteration
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/inherited-properties-omitted.js b/test/built-ins/Object/values/inherited-properties-omitted.js
index c62fc7e6cf41aa212161804d11458d184215218e..a5ad2170450f66b59d4f0aaa77e315801c68ce3c 100644
--- a/test/built-ins/Object/values/inherited-properties-omitted.js
+++ b/test/built-ins/Object/values/inherited-properties-omitted.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values does not see inherited properties.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/observable-operations.js b/test/built-ins/Object/values/observable-operations.js
index e6c12d0b8aead6bdde2b4750c813dfca02f841b4..c68ca98334f9391cee6102d6fb728629f55bf009 100644
--- a/test/built-ins/Object/values/observable-operations.js
+++ b/test/built-ins/Object/values/observable-operations.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values should perform observable operations in the correct order
-es7id: pending
author: Jordan Harband
features: [Proxy]
---*/
diff --git a/test/built-ins/Object/values/primitive-booleans.js b/test/built-ins/Object/values/primitive-booleans.js
index 83739a584b760f542412bb6f469168153345fc6a..b4d81f06832e54b1ac985ee34b2b40a53272bb82 100644
--- a/test/built-ins/Object/values/primitive-booleans.js
+++ b/test/built-ins/Object/values/primitive-booleans.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values accepts boolean primitives.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/primitive-numbers.js b/test/built-ins/Object/values/primitive-numbers.js
index e7ea45a1a1474f91f3cd05c6a4a1d80765d2e321..48a41cb162cee41f49a4d91ed35edf4c84aecd88 100644
--- a/test/built-ins/Object/values/primitive-numbers.js
+++ b/test/built-ins/Object/values/primitive-numbers.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values accepts number primitives.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/primitive-strings.js b/test/built-ins/Object/values/primitive-strings.js
index baf0d0cbe0c2c3c599095b3de28f2de782cd2ea7..77cf35d01e98eca7d2cd1dc6668c1996b2affc00 100644
--- a/test/built-ins/Object/values/primitive-strings.js
+++ b/test/built-ins/Object/values/primitive-strings.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values accepts string primitives.
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/primitive-symbols.js b/test/built-ins/Object/values/primitive-symbols.js
index 32d74d7b05e1aaa5bb32ff42c0ffbbec55428944..2325eacaac0e5bbd5fd7986276e2d397a3f591d9 100644
--- a/test/built-ins/Object/values/primitive-symbols.js
+++ b/test/built-ins/Object/values/primitive-symbols.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values accepts Symbol primitives.
-es7id: pending
author: Jordan Harband
features: [Symbol]
---*/
diff --git a/test/built-ins/Object/values/symbols-omitted.js b/test/built-ins/Object/values/symbols-omitted.js
index c698e355f3547f20c4da17c5ea5c4a675cfb7f6e..b8c8c655f0f8c1cbff24cbb775c6e9dc363c2292 100644
--- a/test/built-ins/Object/values/symbols-omitted.js
+++ b/test/built-ins/Object/values/symbols-omitted.js
@@ -2,8 +2,8 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: Object.values does not include Symbol keys.
-es7id: pending
author: Jordan Harband
features: [Symbol]
---*/
diff --git a/test/built-ins/Object/values/tamper-with-global-object.js b/test/built-ins/Object/values/tamper-with-global-object.js
index df442fe186ea499da62c3572afa8e73fa494dc6e..a0c704eb2fa767b7e55987a0f286677eb3f5d98c 100644
--- a/test/built-ins/Object/values/tamper-with-global-object.js
+++ b/test/built-ins/Object/values/tamper-with-global-object.js
@@ -2,9 +2,9 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: >
Object.values should not have its behavior impacted by modifications to the global property Object
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/Object/values/tamper-with-object-keys.js b/test/built-ins/Object/values/tamper-with-object-keys.js
index bf36a1e240f6e092a3e00ca5fa984cb6627ea23b..9158fd11f80786b63397a9489f45f5ff6c118927 100644
--- a/test/built-ins/Object/values/tamper-with-object-keys.js
+++ b/test/built-ins/Object/values/tamper-with-object-keys.js
@@ -2,9 +2,9 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
+id: sec-object.values
description: >
Object.values should not have its behavior impacted by modifications to Object.keys
-es7id: pending
author: Jordan Harband
---*/
diff --git a/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js b/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js
index 749c9c35526744b73cd7543dfba2a017890cfbc4..f8609d320557dedb722c4f2aebe5c200aa6518c6 100755
--- a/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js
+++ b/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 21.2.5.11
+id: sec-regexp.prototype-@@split
description: The `lastIndex` property is clamped to the string size.
info: >
RegExp.prototype [ @@split ] ( string, limit )
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js b/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
index 970aac3ee05523b2546b7670d299174ff7767e75..26469455633e0ba2e4b1c66583c6f2948600ff34 100755
--- a/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.2.1
+id: sec-arrow-function-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if an arrow function contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/expressions/function/use-strict-with-non-simple-param.js b/test/language/expressions/function/use-strict-with-non-simple-param.js
index cd2aea51c35329350a0ad8fe98a049f40eb2968f..83e6a2d0f895c3cd0094d58258be16ebb2d65c4c 100755
--- a/test/language/expressions/function/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/function/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.1.2
+id: sec-function-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if a function contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/expressions/generators/use-strict-with-non-simple-param.js b/test/language/expressions/generators/use-strict-with-non-simple-param.js
index 45eccdff613a932989a0a91a9cfd17c0ba1cceff..6212aa4dbfe6312e49e6f9b5074f0ba327c9e034 100755
--- a/test/language/expressions/generators/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/generators/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.4.1
+id: sec-generator-function-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if a generator contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
index 257cb8f51383a4810b26922e6000111ab7ddbe40..4fbf4da1121fbc8e6a2c1792d42084970a893b60 100755
--- a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.4.1
+id: sec-generator-function-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if a generator method contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
index d29fc4f741a8b815068b3c96a848ed47e10ebde1..14e738e27e03840714287f17bcf8c2f1595179a2 100755
--- a/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.3.1
+id: sec-method-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if a setter method contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
index 88be43386ea975ee85c6517e73b510e3cd14ccbb..886b395d9d692a8ae64c724ff0e2d55b6d8ba8bb 100755
--- a/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.3.1
+id: sec-method-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if a method contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/function-code/eval-param-env-with-computed-key.js b/test/language/function-code/eval-param-env-with-computed-key.js
index fb881c9de86cd9cf85b41ec0bc05db82d0143f04..c16630431beff7ee5698b203c8d7a4df2d24e4c2 100755
--- a/test/language/function-code/eval-param-env-with-computed-key.js
+++ b/test/language/function-code/eval-param-env-with-computed-key.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.1.19
+id: sec-function-definitions-runtime-semantics-iteratorbindinginitialization
description: If a computed property key contains a direct eval call, a new declarative environment is created.
info: >
Runtime Semantics: IteratorBindingInitialization
diff --git a/test/language/function-code/eval-param-env-with-prop-initializer.js b/test/language/function-code/eval-param-env-with-prop-initializer.js
index d2c98a8226071db8b26374acacc35328df29caf9..60bb5c2a8ffa42eb3ad1e38742e2be6045e52e33 100755
--- a/test/language/function-code/eval-param-env-with-prop-initializer.js
+++ b/test/language/function-code/eval-param-env-with-prop-initializer.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.1.19
+id: sec-function-definitions-runtime-semantics-iteratorbindinginitialization
description: If a property initializer contains a direct eval call, a new declarative environment is created.
info: >
Runtime Semantics: IteratorBindingInitialization
diff --git a/test/language/rest-parameters/array-pattern.js b/test/language/rest-parameters/array-pattern.js
index 1a1b7f2175d02cbc132c96c575db8b9946a0797f..9f02ee73cbd9a024e9ce59e1a4c159faf4b907ba 100755
--- a/test/language/rest-parameters/array-pattern.js
+++ b/test/language/rest-parameters/array-pattern.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 13.3.3
+id: sec-destructuring-binding-patterns
description: >
The rest parameter can be a binding pattern.
info: >
diff --git a/test/language/rest-parameters/object-pattern.js b/test/language/rest-parameters/object-pattern.js
index f50a3de1b839ffbeb06b28095025079148e9d772..d474b338be2e57dd3b3a9e5d94c7d3bbc0be8d2f 100755
--- a/test/language/rest-parameters/object-pattern.js
+++ b/test/language/rest-parameters/object-pattern.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 13.3.3
+id: sec-destructuring-binding-patterns
description: >
The rest parameter can be a binding pattern.
info: >
diff --git a/test/language/statements/function/use-strict-with-non-simple-param.js b/test/language/statements/function/use-strict-with-non-simple-param.js
index 1f0658f6ccb535c6f01e81b9ff95c5d81147c779..8ca9bef3a422cf8341b48b9afaa1f55fefb081fe 100755
--- a/test/language/statements/function/use-strict-with-non-simple-param.js
+++ b/test/language/statements/function/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.1.2
+id: sec-function-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if a function contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/statements/generators/use-strict-with-non-simple-param.js b/test/language/statements/generators/use-strict-with-non-simple-param.js
index 638e52b3c29779f2e54d60c13ea9e6adab83dc71..64de8d767ab5ff521e8fac718f8429def534b060 100755
--- a/test/language/statements/generators/use-strict-with-non-simple-param.js
+++ b/test/language/statements/generators/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: 14.4.1
+id: sec-generator-function-definitions-static-semantics-early-errors
description: >
A SyntaxError is thrown if a generator contains a non-simple parameter list and a UseStrict directive.
info: >
diff --git a/test/language/statements/if/cptn-else-false-abrupt-empty.js b/test/language/statements/if/cptn-else-false-abrupt-empty.js
index 4faeed9e5aef60d36166e822b8245fe13680e94a..ab98eb81fee6a437c1a9d8290b9baf592be7a0ba 100644
--- a/test/language/statements/if/cptn-else-false-abrupt-empty.js
+++ b/test/language/statements/if/cptn-else-false-abrupt-empty.js
@@ -1,7 +1,7 @@
// Copyright (C) 2016 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-if-statement-runtime-semantics-evaluation
description:
Completion value when expression is false with an `else` clause and body
returns an empty abrupt completion
diff --git a/test/language/statements/if/cptn-else-true-abrupt-empty.js b/test/language/statements/if/cptn-else-true-abrupt-empty.js
index 6417f5ff6a5b1198c61b452f2bb887965ee0d4ea..f360d91b99a82e4e1840264f486679fab22cf18c 100644
--- a/test/language/statements/if/cptn-else-true-abrupt-empty.js
+++ b/test/language/statements/if/cptn-else-true-abrupt-empty.js
@@ -1,7 +1,7 @@
// Copyright (C) 2016 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-if-statement-runtime-semantics-evaluation
description: >
Completion value when expression is true with an `else` clause and body
returns an abrupt completion
diff --git a/test/language/statements/if/cptn-no-else-true-abrupt-empty.js b/test/language/statements/if/cptn-no-else-true-abrupt-empty.js
index 90e4fc0454c8a71acfd9723213a7755bcb296f13..2f40684184eb3d1ed0b58c91c331a527a6bc169a 100644
--- a/test/language/statements/if/cptn-no-else-true-abrupt-empty.js
+++ b/test/language/statements/if/cptn-no-else-true-abrupt-empty.js
@@ -1,7 +1,7 @@
// Copyright (C) 2016 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-if-statement-runtime-semantics-evaluation
description: >
Completion value when expression is true without an `else` clause and body
returns an empty abrupt completion
diff --git a/test/language/statements/with/cptn-abrupt-empty.js b/test/language/statements/with/cptn-abrupt-empty.js
index f801a0a3238c644220c39de6bed885760424c1ef..4a00fcbd2aae6284b68510bcf18606b15b94f97d 100644
--- a/test/language/statements/with/cptn-abrupt-empty.js
+++ b/test/language/statements/with/cptn-abrupt-empty.js
@@ -1,7 +1,7 @@
// Copyright (C) 2016 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es7id: pending
+id: sec-with-statement-runtime-semantics-evaluation
description: >
Statement completion value when body returns an empty abrupt completion
info: >