diff --git a/test/built-ins/WeakSet/add-not-callable-throws.js b/test/built-ins/WeakSet/add-not-callable-throws.js
index 2bc25a181403c9f3b0474f710618af746d2ca624..aae684f227118db3c1985a5ad894a036b919b1d4 100644
--- a/test/built-ins/WeakSet/add-not-callable-throws.js
+++ b/test/built-ins/WeakSet/add-not-callable-throws.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   Throws TypeError if add is not callable on constructor call.
 info: >
diff --git a/test/built-ins/WeakSet/constructor.js b/test/built-ins/WeakSet/constructor.js
index f4aa6a952f7514af16bd501622ed0e69e52e563b..a35a14f2739bdc32126e93ed2e8f9e142a1c33a8 100644
--- a/test/built-ins/WeakSet/constructor.js
+++ b/test/built-ins/WeakSet/constructor.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1
+esid: sec-weakset-constructor
 description: >
   The WeakSet constructor is the %WeakSet% intrinsic object and the initial
   value of the WeakSet property of the global object.
diff --git a/test/built-ins/WeakSet/empty-iterable.js b/test/built-ins/WeakSet/empty-iterable.js
index 5f9d61a5922d44e833c7049ccf54d27350ee8ca8..19eb9f94c15936ad7d1101a65cf980cae0deca8c 100644
--- a/test/built-ins/WeakSet/empty-iterable.js
+++ b/test/built-ins/WeakSet/empty-iterable.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   If the iterable argument is empty, return new Weakset object.
 info: >
diff --git a/test/built-ins/WeakSet/get-add-method-failure.js b/test/built-ins/WeakSet/get-add-method-failure.js
index 6f65bbbda5f1f08c15a3197e36e83f42a3fafdf0..1215711c074405d01fab1537d18b1ce59c4b0de7 100644
--- a/test/built-ins/WeakSet/get-add-method-failure.js
+++ b/test/built-ins/WeakSet/get-add-method-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   Return abrupt after getting `add` method.
 info: >
diff --git a/test/built-ins/WeakSet/iterable-failure.js b/test/built-ins/WeakSet/iterable-failure.js
index 865d4b3c44b39e7467034cff24e29bc000739634..fcc3f847bdbc8c023a17e9b7d6cae46525a778c8 100644
--- a/test/built-ins/WeakSet/iterable-failure.js
+++ b/test/built-ins/WeakSet/iterable-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   If the iterable argument is undefined, return new Weakset object.
 info: >
diff --git a/test/built-ins/WeakSet/iterable.js b/test/built-ins/WeakSet/iterable.js
index 14db16bed9a8cf2756d23ad03b09fbedcd5b274a..cf3075b20c383444dcfbf88b8e489faf37f44442 100644
--- a/test/built-ins/WeakSet/iterable.js
+++ b/test/built-ins/WeakSet/iterable.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   Returns the new WeakSet adding the objects from the iterable parameter.
 info: >
diff --git a/test/built-ins/WeakSet/iterator-close-after-add-failure.js b/test/built-ins/WeakSet/iterator-close-after-add-failure.js
index 7ea91410d036b5ad29f58a3d4512f43c7be88d7b..fcd961943829c1fa3f08aa33ef82c7634509eb9b 100644
--- a/test/built-ins/WeakSet/iterator-close-after-add-failure.js
+++ b/test/built-ins/WeakSet/iterator-close-after-add-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   Return IteratorClose(iter, status) if fail on adding value on constructing.
 info: >
diff --git a/test/built-ins/WeakSet/iterator-next-failure.js b/test/built-ins/WeakSet/iterator-next-failure.js
index ccb3c2ca3ee77dc6369b9c7d6f8136904f3ad580..83ec0b2ada438bcec09ae89ab79ae2eea95a3af5 100644
--- a/test/built-ins/WeakSet/iterator-next-failure.js
+++ b/test/built-ins/WeakSet/iterator-next-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   Return abrupt from next iterator step.
 info: >
diff --git a/test/built-ins/WeakSet/iterator-value-failure.js b/test/built-ins/WeakSet/iterator-value-failure.js
index eb13c04b460604ff40b4e05a4758849845f6dfc8..8e692feff17291addfb39cd1029c202026a6ad34 100644
--- a/test/built-ins/WeakSet/iterator-value-failure.js
+++ b/test/built-ins/WeakSet/iterator-value-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   If the iterable argument is empty, return new Weakset object.
 info: >
diff --git a/test/built-ins/WeakSet/length.js b/test/built-ins/WeakSet/length.js
index a8caa23e2e881ff84773a9eee30400e6a25574e8..1be33732d0888509a14e120eba58929dd39579a6 100644
--- a/test/built-ins/WeakSet/length.js
+++ b/test/built-ins/WeakSet/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.2
+esid: sec-properties-of-the-weakset-constructor
 description: >
   The length property of the WeakSet constructor is 0.
 includes: [propertyHelper.js]
diff --git a/test/built-ins/WeakSet/name.js b/test/built-ins/WeakSet/name.js
index 7cacba4420b3769284880da589fb0e53609e3150..9febed30852f64c21d87ae7ab0d4fa674e221c30 100644
--- a/test/built-ins/WeakSet/name.js
+++ b/test/built-ins/WeakSet/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
     WeakSet ( [ iterable ] )
 
diff --git a/test/built-ins/WeakSet/no-iterable.js b/test/built-ins/WeakSet/no-iterable.js
index f3ff681a2d17eb9d1ffba8811fd96d7bf06c040d..ab36287bd496109b7027682ec0affbc7658662e2 100644
--- a/test/built-ins/WeakSet/no-iterable.js
+++ b/test/built-ins/WeakSet/no-iterable.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   If the iterable argument is undefined, return new Weakset object.
 info: >
diff --git a/test/built-ins/WeakSet/properties-of-the-weakset-prototype-object.js b/test/built-ins/WeakSet/properties-of-the-weakset-prototype-object.js
index b71d698326ce3193a4aca6a4d4cec6e0f4572cfa..cd82c38040946c83aecc04cc5b26de0897ed13c2 100644
--- a/test/built-ins/WeakSet/properties-of-the-weakset-prototype-object.js
+++ b/test/built-ins/WeakSet/properties-of-the-weakset-prototype-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3
+esid: sec-properties-of-the-weakset-prototype-object
 description: >
   The WeakSet.prototype's prototype is Object.prototype.
 info: >
diff --git a/test/built-ins/WeakSet/proto-from-ctor-realm.js b/test/built-ins/WeakSet/proto-from-ctor-realm.js
index f126f2fb553be9e297cffb84c4b414ad1ffbfa4e..504ca0c8ffe053815d78e96dd8e481b3b8676a78 100644
--- a/test/built-ins/WeakSet/proto-from-ctor-realm.js
+++ b/test/built-ins/WeakSet/proto-from-ctor-realm.js
@@ -1,8 +1,8 @@
 // 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-weakset-iterable
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: Default [[Prototype]] value derived from realm of the newTarget
 info: |
     [...]
diff --git a/test/built-ins/WeakSet/prototype-of-weakset.js b/test/built-ins/WeakSet/prototype-of-weakset.js
index e9389ac13c72faa7ce9b081af0b6aba1ba2d6580..c91af1d44ad983b54128008d2454ab4429c4b169 100644
--- a/test/built-ins/WeakSet/prototype-of-weakset.js
+++ b/test/built-ins/WeakSet/prototype-of-weakset.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.2
+esid: sec-properties-of-the-weakset-constructor
 description: >
   The value of the [[Prototype]] internal slot of the WeakSet constructor
   is the intrinsic object %FunctionPrototype% (19.2.3).
diff --git a/test/built-ins/WeakSet/prototype/Symbol.toStringTag.js b/test/built-ins/WeakSet/prototype/Symbol.toStringTag.js
index 33f9c1eff1a21bebf505dc522c9a7b3f7129faaf..b71ec58193e7dab12400b825904c4d1a28c74c0b 100644
--- a/test/built-ins/WeakSet/prototype/Symbol.toStringTag.js
+++ b/test/built-ins/WeakSet/prototype/Symbol.toStringTag.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.5
+esid: sec-weakset.prototype-@@tostringtag
 description: >
     `Symbol.toStringTag` property descriptor
 info: >
diff --git a/test/built-ins/WeakSet/prototype/add/add.js b/test/built-ins/WeakSet/prototype/add/add.js
index 6c76c71d94fcf48a0f628d71dd75695b39384d4e..724d972b6c4db0e249a2badff6666fec9893f90f 100644
--- a/test/built-ins/WeakSet/prototype/add/add.js
+++ b/test/built-ins/WeakSet/prototype/add/add.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: WeakSet.prototype.add property descriptor
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/adds-element.js b/test/built-ins/WeakSet/prototype/add/adds-element.js
index 1f491806fda44b9ee5ec41dfd216e0327d93d4cd..16a87738f2467da74ba636d619dc6231357ac956 100644
--- a/test/built-ins/WeakSet/prototype/add/adds-element.js
+++ b/test/built-ins/WeakSet/prototype/add/adds-element.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: >
   Appends value as the last element of entries.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-array.js b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-array.js
index 81e458bd55be782b4096992472a926808268e48a..c7f77328628c97c75b7f60be9ab43632437abecc 100644
--- a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-array.js
+++ b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-array.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-map.js b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-map.js
index 26aafb60b15913e80dbd24c19bca9ac6676f12bd..4fd310e21f100e7b2bcf12aead8cba2a55729038 100644
--- a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-map.js
+++ b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-map.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-object.js b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-object.js
index 2b13e930cc2a7b5ef5989e685512c1619045d45a..0c04e4d48c319fa5d987793e9e1951031af972ca 100644
--- a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-object.js
+++ b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-set.js b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-set.js
index a1b248d2675b03e042191aef2f17095bb2e415a0..19540f1ee20778e12ca3466bb958f033db8367fa 100644
--- a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-set.js
+++ b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-weakset-prototype.js b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
index d4f285aa8fde2fd113860b906c7c24118a23f6af..7dcb7da259c4a8cf892097c12f38d0c6994ae193 100644
--- a/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
+++ b/test/built-ins/WeakSet/prototype/add/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/add/length.js b/test/built-ins/WeakSet/prototype/add/length.js
index 3e7838bace5a5a68b693871a1147012cb4d42c64..1c5d14d2147eb441ffcc468996b28ee5df3442c8 100644
--- a/test/built-ins/WeakSet/prototype/add/length.js
+++ b/test/built-ins/WeakSet/prototype/add/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: WeakSet.prototype.add.length descriptor
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/name.js b/test/built-ins/WeakSet/prototype/add/name.js
index b88aa93f78ddceeb14fa89850a6960a6f7fbd3c0..e49630ef3a403a19c046504b38db972625023a2d 100644
--- a/test/built-ins/WeakSet/prototype/add/name.js
+++ b/test/built-ins/WeakSet/prototype/add/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: WeakSet.prototype.add.name descriptor
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/returns-this-when-ignoring-duplicate.js b/test/built-ins/WeakSet/prototype/add/returns-this-when-ignoring-duplicate.js
index d7363bb184d60e0d6b583204ee41055a4e0c84e0..160b6b8f81cd54ce64a83b811f4b515858e26110 100644
--- a/test/built-ins/WeakSet/prototype/add/returns-this-when-ignoring-duplicate.js
+++ b/test/built-ins/WeakSet/prototype/add/returns-this-when-ignoring-duplicate.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Returns `this` when new value is duplicate.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/returns-this.js b/test/built-ins/WeakSet/prototype/add/returns-this.js
index 789ccbd53d92df9eddb9a321a98e3a7048a973d9..7b457263d9bd733df0977fa32df42150ebbaad58 100644
--- a/test/built-ins/WeakSet/prototype/add/returns-this.js
+++ b/test/built-ins/WeakSet/prototype/add/returns-this.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Returns `this` after adding a new value.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-boolean.js b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-boolean.js
index 0c0683b1326089eab6f1353521c71c21f4b3d9ab..8e2fb9ab4c8e115b9251ec2838fd8ab9123b0a24 100644
--- a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-boolean.js
+++ b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-boolean.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-null.js b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-null.js
index 369e7daf8d25c3fe66c45ebfe62b70fc14b44b45..b48c99f83935a5be13293c7411b672af5dc498fa 100644
--- a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-null.js
+++ b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-null.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-number.js b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-number.js
index 0ce12e338e3d465877f8fbd1a5834d786f1f2841..d90f74e5002ce734d1cbba76450047e4cb9c3298 100644
--- a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-number.js
+++ b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-number.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-string.js b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-string.js
index d2390d5405bec5b319e38b527536d659df43313b..27bc22255dea6c8ab653ed9a09aa63666dfce3b1 100644
--- a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-string.js
+++ b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-string.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-symbol.js b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-symbol.js
index d54f84ef0d55c185fe7f0b5a8fdd710931f3b155..201d2c33d20a3d417d216f0b2fe5dd6aa75112d9 100644
--- a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-symbol.js
+++ b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-symbol.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-undefined.js b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-undefined.js
index daf6c2393dc74ab592cd156a2d7ad1bc1b157444..cf24d6ae33f61de2fe524aa18ca27c0de7f31548 100644
--- a/test/built-ins/WeakSet/prototype/add/this-not-object-throw-undefined.js
+++ b/test/built-ins/WeakSet/prototype/add/this-not-object-throw-undefined.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/add/value-not-object-throw.js b/test/built-ins/WeakSet/prototype/add/value-not-object-throw.js
index 622a6e5d4c2cdcadf5eb02d64712689b80c2ec67..7115398c210feb0a467ee975fc35e55dfd80a34a 100644
--- a/test/built-ins/WeakSet/prototype/add/value-not-object-throw.js
+++ b/test/built-ins/WeakSet/prototype/add/value-not-object-throw.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1
+esid: sec-weakset.prototype.add
 description: Throws TypeError if `value` is not Object.
 info: >
   WeakSet.prototype.add ( value )
diff --git a/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor-intrinsic.js b/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor-intrinsic.js
index 5eb8862f6695ee41feacc35dc5d4d0e523f24704..6e429720030c61dea94e30b8bed9cd52b6d74302 100644
--- a/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor-intrinsic.js
+++ b/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor-intrinsic.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.2
+esid: sec-weakset.prototype.constructor
 description: >
   The initial value of WeakSet.prototype.constructor is the %WeakSet%
   intrinsic object.
diff --git a/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor.js b/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor.js
index 5773f7eed3140c52511192f7316ace8e8b15972d..a40f65adc9b2924a6accfc1e87e7ed04531a936e 100644
--- a/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor.js
+++ b/test/built-ins/WeakSet/prototype/constructor/weakset-prototype-constructor.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.2
+esid: sec-weakset.prototype.constructor
 description: >
   WeakSet.prototype.constructor property descriptor
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/delete-entry-initial-iterable.js b/test/built-ins/WeakSet/prototype/delete/delete-entry-initial-iterable.js
index 02e2845a4722530f1380875004bccead53a9c7f8..7285ecfda201fd204829ae72f99b5e705083d8a8 100644
--- a/test/built-ins/WeakSet/prototype/delete/delete-entry-initial-iterable.js
+++ b/test/built-ins/WeakSet/prototype/delete/delete-entry-initial-iterable.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Delete an entry from initial iterable.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/delete-entry.js b/test/built-ins/WeakSet/prototype/delete/delete-entry.js
index 286c2693c25a238d591da9972cfd689ebadfa441..a511c92e8c46fc3abb955cf655db49845226f5cb 100644
--- a/test/built-ins/WeakSet/prototype/delete/delete-entry.js
+++ b/test/built-ins/WeakSet/prototype/delete/delete-entry.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Delete an entry.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/delete.js b/test/built-ins/WeakSet/prototype/delete/delete.js
index 0e5c9bb3fc27c0be656e3736b17b0b006823b128..d0ead3f3f73bc227481abbcc591d4dd0cd07ef6f 100644
--- a/test/built-ins/WeakSet/prototype/delete/delete.js
+++ b/test/built-ins/WeakSet/prototype/delete/delete.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   WeakSet.prototype.delete property descriptor
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-array.js b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-array.js
index f90157dd8e28a2c4f885bac90c9421ad40abbdc9..d88e4937761b3572aa132fe9619fcf2af423117f 100644
--- a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-array.js
+++ b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-array.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-map.js b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-map.js
index f779e09da6e071c9abfa3e062b159b4a221c4c92..5aac433fcd6a18f4c386c3ce4df45cfaf1d11e1a 100644
--- a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-map.js
+++ b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-map.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-object.js b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-object.js
index 7758d011391fb283a4529080a364219e14fc0ea5..378cc966db028cefd1a56e8528b0adb71d2dc05f 100644
--- a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-object.js
+++ b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-set.js b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-set.js
index c18918a336ec74b3af10dee46d2123ba9e2a8a94..b463548027a351ec2734e211e19f56148e4fdc90 100644
--- a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-set.js
+++ b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-weakset-prototype.js b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
index 276472ff28296aa8a1d9dbdd460d2cb2e58b9d05..d2f16d84517cebbf8867bd6625de03b472ef049c 100644
--- a/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
+++ b/test/built-ins/WeakSet/prototype/delete/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/length.js b/test/built-ins/WeakSet/prototype/delete/length.js
index 37ed98ddfa31251c0c0fa01cb79e05a978c82b7b..ecc54b7cc7b08a46f1e085d5682c557aa4dc868b 100644
--- a/test/built-ins/WeakSet/prototype/delete/length.js
+++ b/test/built-ins/WeakSet/prototype/delete/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   WeakSet.prototype.delete.length value and writability.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/name.js b/test/built-ins/WeakSet/prototype/delete/name.js
index 83f7e6b004642edc530ea13c7ab1ad04f71af7d0..25b7c046c08ddc335fc9a20e985b5cb9d4b6b034 100644
--- a/test/built-ins/WeakSet/prototype/delete/name.js
+++ b/test/built-ins/WeakSet/prototype/delete/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   WeakSet.prototype.delete.name value and writability.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/returns-false-value-is-not-object.js b/test/built-ins/WeakSet/prototype/delete/returns-false-value-is-not-object.js
index f832e6d066ae9e3ce07fb3527ea0623bf95feea5..b1346ab8d46db2961feb97f6bbd7fadc416071c3 100644
--- a/test/built-ins/WeakSet/prototype/delete/returns-false-value-is-not-object.js
+++ b/test/built-ins/WeakSet/prototype/delete/returns-false-value-is-not-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Return false if value is not a non-null Object.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/returns-false-when-delete-is-noop.js b/test/built-ins/WeakSet/prototype/delete/returns-false-when-delete-is-noop.js
index 9c549cd96a0ff919bd80c18c48cb6a6331344c08..96ad95a14356dbe156e3d77dbff04f34012dc2c1 100644
--- a/test/built-ins/WeakSet/prototype/delete/returns-false-when-delete-is-noop.js
+++ b/test/built-ins/WeakSet/prototype/delete/returns-false-when-delete-is-noop.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: >
   Return false if entry wasn't in the WeakSet.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-boolean.js b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-boolean.js
index 6e7beed6b432133b0308b575c04794ca4aeb4fc9..e67b245d77424339a559d26a85a85138639f5746 100644
--- a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-boolean.js
+++ b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-boolean.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.delete ( value )
diff --git a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-null.js b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-null.js
index f71201387f6326d59b7bd0d8943f2969e799519a..091be2b6ccebd3860971b28cd59836645ef5e45f 100644
--- a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-null.js
+++ b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-null.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.delete ( value )
diff --git a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-number.js b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-number.js
index 7abf01627537cfc00f09e5dbf2b2d83d8160f7f1..8f0db3e2a98afa665a52171ce8e18a821f4cf718 100644
--- a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-number.js
+++ b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-number.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.delete ( value )
diff --git a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-string.js b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-string.js
index a91650db8cddc469d2db3e9b3e018ce20ee90484..1d2e5db9a28ef22e7d462d458b060c5fb3fe95f1 100644
--- a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-string.js
+++ b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-string.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.delete ( value )
diff --git a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-symbol.js b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-symbol.js
index 76df4a419e35872dee3ee319c84ee98532149121..8624f6dd0dddaa28d2c459f4bb0ac1e3f8916261 100644
--- a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-symbol.js
+++ b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-symbol.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.delete ( value )
diff --git a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-undefined.js b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-undefined.js
index 9d816870b39e5b7ac4b30232573a69d4d3d8ea78..58f156ac133a3012caa79edd2875d33e2944655a 100644
--- a/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-undefined.js
+++ b/test/built-ins/WeakSet/prototype/delete/this-not-object-throw-undefined.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.3
+esid: sec-weakset.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.delete ( value )
diff --git a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-array.js b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-array.js
index 0fd9d989cfedcd2acaa740e1ec04d35bb66834d4..89e77d42a7bd80bf7facc43da145d63b6fa8e308 100644
--- a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-array.js
+++ b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-array.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-map.js b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-map.js
index e821224378cd85d40e840cc989813591a178c762..d87f50f227cccae2611b5e0f1ab4a97f3d79a381 100644
--- a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-map.js
+++ b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-map.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-object.js b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-object.js
index 058319b236e80cc9112678d26d1b661a7f54ddd8..ec71eb87a40a3e7af44914e2f091ad754a5eb263 100644
--- a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-object.js
+++ b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-set.js b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-set.js
index e024db3f733bf680b68b685a7fb42bc3f20016b3..4ffa2536b68856bbbbef2f4ae4b6f9ad45b7af84 100644
--- a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-set.js
+++ b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-weakset-prototype.js b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
index d21ef2180a37929b8db0b2186ec3d6edb63bb447..1863cd7dd9c3b7b0931d53cfd0cdc6da50c95f24 100644
--- a/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
+++ b/test/built-ins/WeakSet/prototype/has/does-not-have-weaksetdata-internal-slot-weakset-prototype.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Throws TypeError if context doesn't have a [[WeakSetData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/has.js b/test/built-ins/WeakSet/prototype/has/has.js
index 8a30652ff9e4425d180d9597de07699c6c16f660..b5522f7c3de439769fab31a29f74abe2dfa779c5 100644
--- a/test/built-ins/WeakSet/prototype/has/has.js
+++ b/test/built-ins/WeakSet/prototype/has/has.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   WeakSet.prototype.has property descriptor
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/length.js b/test/built-ins/WeakSet/prototype/has/length.js
index c8564f4d02f56558f2f979189c009c78954e4e9b..2695419e3b2c71efde0131bca4d6d5080d0d8701 100644
--- a/test/built-ins/WeakSet/prototype/has/length.js
+++ b/test/built-ins/WeakSet/prototype/has/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   WeakSet.prototype.has.length value and writability.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/name.js b/test/built-ins/WeakSet/prototype/has/name.js
index ef8f1be9f257cfa0f1d24295ca7f59a200173552..5c7d27de8f2afd012ffd81d1d145a55b5f50e49e 100644
--- a/test/built-ins/WeakSet/prototype/has/name.js
+++ b/test/built-ins/WeakSet/prototype/has/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   WeakSet.prototype.has.name value and writability.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/returns-false-when-value-is-not-object.js b/test/built-ins/WeakSet/prototype/has/returns-false-when-value-is-not-object.js
index 803da8bd370c24196a0513a4506e7876ac83cea5..e7cc1838b9671d1c09db5f33e7dce8e340f601bb 100644
--- a/test/built-ins/WeakSet/prototype/has/returns-false-when-value-is-not-object.js
+++ b/test/built-ins/WeakSet/prototype/has/returns-false-when-value-is-not-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Returns false if value is not a non-null Object.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/returns-false-when-value-not-present.js b/test/built-ins/WeakSet/prototype/has/returns-false-when-value-not-present.js
index e0a3efc8cc7354f2a2a89b50810284acbd620d5c..22c055d7cbf5b42dc867ecb937118660d3347649 100644
--- a/test/built-ins/WeakSet/prototype/has/returns-false-when-value-not-present.js
+++ b/test/built-ins/WeakSet/prototype/has/returns-false-when-value-not-present.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Return false when value is not present in the WeakSet entries.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/returns-true-when-value-present.js b/test/built-ins/WeakSet/prototype/has/returns-true-when-value-present.js
index 7ef09dba34b3f02dfa6d4c3c73922b0fbfb367dc..aa781a1ee316929c59c73c2a0c9ceae1ac587402 100644
--- a/test/built-ins/WeakSet/prototype/has/returns-true-when-value-present.js
+++ b/test/built-ins/WeakSet/prototype/has/returns-true-when-value-present.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: >
   Returns true when value is present in the WeakSet entries list.
 info: >
diff --git a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-boolean.js b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-boolean.js
index b5e99ab6d9d2e5190aae81db5f29ffa0cea45a4d..a55a29e8c388102446ce9ff4d125ef93c602c2f8 100644
--- a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-boolean.js
+++ b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-boolean.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.has ( value )
diff --git a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-null.js b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-null.js
index 4ea248c717550ab22b63dc9c617664ba3b495b32..e0bbf4705f0ceb232dadf440c95b1804ab4c0f9f 100644
--- a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-null.js
+++ b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-null.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.has ( value )
diff --git a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-number.js b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-number.js
index 7b23eb999eb27681e245be151b86578e624b67c7..7c647aae38fd3c66bf5588cb09b25011c95f0dd6 100644
--- a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-number.js
+++ b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-number.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.has ( value )
diff --git a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-string.js b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-string.js
index 315c5d240d959c7094aec538b552a1cb2ced7c7e..6797162ede356a454233ada5ef653b7499486d90 100644
--- a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-string.js
+++ b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-string.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.has ( value )
diff --git a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-symbol.js b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-symbol.js
index cecb82acbfbc1ddc501e914f1d9aec00a57fdcc6..bf6ab69d2d29a035285075fc6720d4c8e264c811 100644
--- a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-symbol.js
+++ b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-symbol.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.has ( value )
diff --git a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-undefined.js b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-undefined.js
index b45fe70d6d62f2be60afd9b854a30f1c63af2a3f..c0369d1731e7ad1810ba72d69e8ed543095d998f 100644
--- a/test/built-ins/WeakSet/prototype/has/this-not-object-throw-undefined.js
+++ b/test/built-ins/WeakSet/prototype/has/this-not-object-throw-undefined.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.4
+esid: sec-weakset.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakSet.prototype.has ( value )
diff --git a/test/built-ins/WeakSet/prototype/prototype-attributes.js b/test/built-ins/WeakSet/prototype/prototype-attributes.js
index 2d5f542469b6658528f09f1d5e5a91ab997b9841..41aeac29598689b1d0984ea1143c0e44a7e885b0 100644
--- a/test/built-ins/WeakSet/prototype/prototype-attributes.js
+++ b/test/built-ins/WeakSet/prototype/prototype-attributes.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.2.1
+esid: sec-weakset.prototype
 description: >
   WeakSet.prototype is not writable, not enumerable and not configurable.
 includes: [propertyHelper.js]
diff --git a/test/built-ins/WeakSet/symbol-disallowed-as-weakset-key.js b/test/built-ins/WeakSet/symbol-disallowed-as-weakset-key.js
index ce895ae1613706542364b0f5265a73866736b4a5..148ff2d0deeb8b1fe8427b8d6cf67068e1479a10 100644
--- a/test/built-ins/WeakSet/symbol-disallowed-as-weakset-key.js
+++ b/test/built-ins/WeakSet/symbol-disallowed-as-weakset-key.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.3.1_S2
+esid: sec-weakset.prototype.add
 description: >
   Symbol may not be used as a WeakSet entry
 features: [WeakSet]
diff --git a/test/built-ins/WeakSet/undefined-newtarget.js b/test/built-ins/WeakSet/undefined-newtarget.js
index c25a85bcdefd1d05123fadf12fecd1ade7fdb74e..eb81c79583b3e8b7a9d682a72a046c5f6f996e14 100644
--- a/test/built-ins/WeakSet/undefined-newtarget.js
+++ b/test/built-ins/WeakSet/undefined-newtarget.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   The WeakSet constructor is the %WeakSet% intrinsic object and the initial
   value of the WeakSet property of the global object.
diff --git a/test/built-ins/WeakSet/weakset.js b/test/built-ins/WeakSet/weakset.js
index 312581668c2dfaf39085f4c44867e1ca194be27f..59dacb52ec5293e06424a4d93a639393e2769cdb 100644
--- a/test/built-ins/WeakSet/weakset.js
+++ b/test/built-ins/WeakSet/weakset.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.4.1.1
+esid: sec-weakset-iterable
 description: >
   WeakSet ( [ iterable ] )