diff --git a/test/built-ins/WeakMap/constructor.js b/test/built-ins/WeakMap/constructor.js
index 90a3ab6eaf33c34e3fdb2a4e4e516c584d3b4787..12ca92b01c57a9f0e52adccf2ff021f8155fa0de 100644
--- a/test/built-ins/WeakMap/constructor.js
+++ b/test/built-ins/WeakMap/constructor.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1
+esid: sec-weakmap-constructor
 description: >
   The WeakMap constructor is the %WeakMap% intrinsic object and the initial
   value of the WeakMap property of the global object.
diff --git a/test/built-ins/WeakMap/empty-iterable.js b/test/built-ins/WeakMap/empty-iterable.js
index 045e2df5bc58f267ca79116ac360b12dec48de8c..f36a66d19f64a48ea0643736f1c3bab4b85836a0 100644
--- a/test/built-ins/WeakMap/empty-iterable.js
+++ b/test/built-ins/WeakMap/empty-iterable.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   If the iterable argument is empty, return new WeakMap object.
 info: >
diff --git a/test/built-ins/WeakMap/get-set-method-failure.js b/test/built-ins/WeakMap/get-set-method-failure.js
index b24a30069115e7175944d2a9f1429edef541a39d..fd7fd7753a39ef1cacf87e7f34329f499401ff7c 100644
--- a/test/built-ins/WeakMap/get-set-method-failure.js
+++ b/test/built-ins/WeakMap/get-set-method-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Return abrupt after getting `set` method.
 info: >
diff --git a/test/built-ins/WeakMap/iterable-failure.js b/test/built-ins/WeakMap/iterable-failure.js
index f28e5a9b9177da7590ba6e608c0eaaa5bc95b28e..9408a9c1bf7953c93d8557ecc1dd6d0623d7b2be 100644
--- a/test/built-ins/WeakMap/iterable-failure.js
+++ b/test/built-ins/WeakMap/iterable-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   If the iterable argument is undefined, return new WeakMap object.
 info: >
diff --git a/test/built-ins/WeakMap/iterable.js b/test/built-ins/WeakMap/iterable.js
index c964e0e6d04183d06053a6e6fa2a088838bb9539..b87a93742099cc0ee553fbca8e6082be6cf67e2d 100644
--- a/test/built-ins/WeakMap/iterable.js
+++ b/test/built-ins/WeakMap/iterable.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Returns the new WeakMap adding the objects from the iterable parameter.
 info: >
diff --git a/test/built-ins/WeakMap/iterator-close-after-set-failure.js b/test/built-ins/WeakMap/iterator-close-after-set-failure.js
index c4597f76b27525ef72016e3661949728b425f58b..2624cf1c06875a4e530837bd83066323677b4392 100644
--- a/test/built-ins/WeakMap/iterator-close-after-set-failure.js
+++ b/test/built-ins/WeakMap/iterator-close-after-set-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Return IteratorClose(iter, status) if fail on adding value on constructing.
 info: >
diff --git a/test/built-ins/WeakMap/iterator-item-first-entry-returns-abrupt.js b/test/built-ins/WeakMap/iterator-item-first-entry-returns-abrupt.js
index e3b9a017ba879b4fafac7ab3e0fe3acadb2b48fa..91eb06fc260dd97c766f0f9a890514dc9b48cd4d 100644
--- a/test/built-ins/WeakMap/iterator-item-first-entry-returns-abrupt.js
+++ b/test/built-ins/WeakMap/iterator-item-first-entry-returns-abrupt.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Closes iterator if item first entry completes abruptly.
 info: >
diff --git a/test/built-ins/WeakMap/iterator-item-second-entry-returns-abrupt.js b/test/built-ins/WeakMap/iterator-item-second-entry-returns-abrupt.js
index a3e0c83e43f93b1e22aa9a5a54219025c0b58404..65371034a7d5590195a176daa5269955938f7953 100644
--- a/test/built-ins/WeakMap/iterator-item-second-entry-returns-abrupt.js
+++ b/test/built-ins/WeakMap/iterator-item-second-entry-returns-abrupt.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Closes iterator if item second entry completes abruptly.
 info: >
diff --git a/test/built-ins/WeakMap/iterator-items-are-not-object-close-iterator.js b/test/built-ins/WeakMap/iterator-items-are-not-object-close-iterator.js
index b50834448e86de8fed12b5dce2cefa46a3e3d9ab..5ee3624495e1ce889da48eee8d6cd411d2f0451b 100644
--- a/test/built-ins/WeakMap/iterator-items-are-not-object-close-iterator.js
+++ b/test/built-ins/WeakMap/iterator-items-are-not-object-close-iterator.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Closes the iterator object after not object error on next item.
 info: >
diff --git a/test/built-ins/WeakMap/iterator-items-are-not-object.js b/test/built-ins/WeakMap/iterator-items-are-not-object.js
index be1904a66cc85ac530c011665a2634d58f479973..2eccbff5d5396a22f087de21955d46ca836ca8ea 100644
--- a/test/built-ins/WeakMap/iterator-items-are-not-object.js
+++ b/test/built-ins/WeakMap/iterator-items-are-not-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Throws a TypeError if iterable itens are not Objects.
 info: >
diff --git a/test/built-ins/WeakMap/iterator-next-failure.js b/test/built-ins/WeakMap/iterator-next-failure.js
index cb084f0907df0a37f8aca9116fc0227a23cea91b..ef0be06876f2107db540177d74b0ce175e76dbf0 100644
--- a/test/built-ins/WeakMap/iterator-next-failure.js
+++ b/test/built-ins/WeakMap/iterator-next-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Return abrupt from next iterator step.
 info: >
diff --git a/test/built-ins/WeakMap/iterator-value-failure.js b/test/built-ins/WeakMap/iterator-value-failure.js
index 7a0626dd4262e551acaffc01b65f2b79b779e6d3..eaad1004c59d724c8ecf3a79d79a66f0d46bc106 100644
--- a/test/built-ins/WeakMap/iterator-value-failure.js
+++ b/test/built-ins/WeakMap/iterator-value-failure.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   If the iterable argument is empty, return new WeakMap object.
 info: >
diff --git a/test/built-ins/WeakMap/length.js b/test/built-ins/WeakMap/length.js
index 2db93622b8d0fc3619d3f83966b16d3d96714b53..1cfe69bbd0eabe8ac000356605cced28a0d76eec 100644
--- a/test/built-ins/WeakMap/length.js
+++ b/test/built-ins/WeakMap/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.2
+esid: sec-properties-of-the-weakmap-constructor
 description: >
   The length property of the WeakMap constructor is 0.
 includes: [propertyHelper.js]
diff --git a/test/built-ins/WeakMap/name.js b/test/built-ins/WeakMap/name.js
index 75d24e2bbc7b292e3ddaf682556fd1710692c8b6..7aafce494c13910c85606e5c6540f44191e7b3ab 100644
--- a/test/built-ins/WeakMap/name.js
+++ b/test/built-ins/WeakMap/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
     WeakMap ( [ iterable ] )
 
diff --git a/test/built-ins/WeakMap/no-iterable.js b/test/built-ins/WeakMap/no-iterable.js
index 229a28fde2f0bc187b1246c258710ed7c2e82c3d..8cc1d61b67c3e682992d386fa540d08db5788e4d 100644
--- a/test/built-ins/WeakMap/no-iterable.js
+++ b/test/built-ins/WeakMap/no-iterable.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   If the iterable argument is undefined, return new WeakMap object.
 info: >
diff --git a/test/built-ins/WeakMap/properties-of-map-instances.js b/test/built-ins/WeakMap/properties-of-map-instances.js
index f928f0bec4e3e08c64e4374bdbe2c26dcaa38949..e9d40fa229c585a2c24ab54850995a0a20580db0 100644
--- a/test/built-ins/WeakMap/properties-of-map-instances.js
+++ b/test/built-ins/WeakMap/properties-of-map-instances.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.4
+esid: sec-properties-of-weakmap-instances
 description: >
   WeakMap instances are ordinary objects that inherit properties from the
   WeakMap prototype.
diff --git a/test/built-ins/WeakMap/properties-of-the-weakmap-prototype-object.js b/test/built-ins/WeakMap/properties-of-the-weakmap-prototype-object.js
index bebb9f9454b7ce14285f1c16757dac29a05af589..35311782ef28291f4ab7eb49ea7f87f95d7a3288 100644
--- a/test/built-ins/WeakMap/properties-of-the-weakmap-prototype-object.js
+++ b/test/built-ins/WeakMap/properties-of-the-weakmap-prototype-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3
+esid: sec-properties-of-the-weakmap-prototype-object
 description: >
   The WeakMap.prototype's prototype is Object.prototype.
 info: >
diff --git a/test/built-ins/WeakMap/proto-from-ctor-realm.js b/test/built-ins/WeakMap/proto-from-ctor-realm.js
index b010ff5adeea1a24c7d5af74aafefb353f238b4d..4188f56865dc693d35cfd95bbcb5e16d651fdc00 100644
--- a/test/built-ins/WeakMap/proto-from-ctor-realm.js
+++ b/test/built-ins/WeakMap/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-weakmap-iterable
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: Default [[Prototype]] value derived from realm of the newTarget
 info: |
     [...]
diff --git a/test/built-ins/WeakMap/prototype-of-weakmap.js b/test/built-ins/WeakMap/prototype-of-weakmap.js
index c93853eb23d4cc001a090d882b8cf76fab778ddb..deeaa1f27e72f2170c76b3f597a1eb0d6d49ca1e 100644
--- a/test/built-ins/WeakMap/prototype-of-weakmap.js
+++ b/test/built-ins/WeakMap/prototype-of-weakmap.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.2
+esid: sec-properties-of-the-weakmap-constructor
 description: >
   The value of the [[Prototype]] internal slot of the WeakMap constructor is the
   intrinsic object %FunctionPrototype% (19.2.3).
diff --git a/test/built-ins/WeakMap/prototype/Symbol.toStringTag.js b/test/built-ins/WeakMap/prototype/Symbol.toStringTag.js
index a5fb0227b061d3fc806fa61f32abca432027be88..c9d19c91a53f89a7a16a661b43ec1d294c1f09f9 100644
--- a/test/built-ins/WeakMap/prototype/Symbol.toStringTag.js
+++ b/test/built-ins/WeakMap/prototype/Symbol.toStringTag.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.6
+esid: sec-weakmap.prototype-@@tostringtag
 description: >
     `Symbol.toStringTag` property descriptor
 info: >
diff --git a/test/built-ins/WeakMap/prototype/constructor.js b/test/built-ins/WeakMap/prototype/constructor.js
index 19ee90ee0dc56d14501e58d82dbf049ef2a83436..186d6fee70bd340952fe9841d2caeb76d683c18f 100644
--- a/test/built-ins/WeakMap/prototype/constructor.js
+++ b/test/built-ins/WeakMap/prototype/constructor.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.1
+esid: sec-weakmap.prototype.constructor
 description: >
   WeakMap.prototype.constructor value and property descriptor
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/delete-entry-initial-iterable.js b/test/built-ins/WeakMap/prototype/delete/delete-entry-initial-iterable.js
index b5858f5f28ae9fbea8b7e75775dbe0fb478940db..d4b126682968ed0ce0184d154b22fbaf5138d321 100644
--- a/test/built-ins/WeakMap/prototype/delete/delete-entry-initial-iterable.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Delete an entry from initial iterable.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/delete-entry.js b/test/built-ins/WeakMap/prototype/delete/delete-entry.js
index 8faa832ff9d5f72fc09837299ecfce13e9041808..a7b636e3467ccdf87b5dfa5a6a599379d1a9a643 100644
--- a/test/built-ins/WeakMap/prototype/delete/delete-entry.js
+++ b/test/built-ins/WeakMap/prototype/delete/delete-entry.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Delete an entry.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/delete.js b/test/built-ins/WeakMap/prototype/delete/delete.js
index a75c7af1d5e7e150496d01b21f26565f5582f14e..3dc45c4a4cbd0da5a979648928de8749eb64dd66 100644
--- a/test/built-ins/WeakMap/prototype/delete/delete.js
+++ b/test/built-ins/WeakMap/prototype/delete/delete.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   WeakMap.prototype.delete property descriptor
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-array.js b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-array.js
index 8cc80bf620df7043d11420b7b5a5c4b52fe1696e..2795622a902a6f8bad7cedbcfbeb638834a7b695 100644
--- a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-array.js
+++ b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-array.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-map.js b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-map.js
index cb5807eee724878902219bd7d5142b2b0ab2b7cb..0ef063dc6dffeeb1556a2a76643eee3f1cc04a66 100644
--- a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-map.js
+++ b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-map.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-object.js b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-object.js
index 94d6dcaed95ff3bffe2ebde20e3c5cc97ff46b2f..d12dcd2ecaba183023f3b357311da0d209ce8d38 100644
--- a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-object.js
+++ b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-set.js b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-set.js
index c523557f9100e9f03431e7251c9ae1399e2f5138..1001f28686fa80024625dd79954b6f0ccc61ca5a 100644
--- a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-set.js
+++ b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
index 5ed3f33f4d32f334c5472116545cb05bcb4ac290..3fcb1ce4d5c3340c91687c52130e621907132bfd 100644
--- a/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
+++ b/test/built-ins/WeakMap/prototype/delete/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/length.js b/test/built-ins/WeakMap/prototype/delete/length.js
index ff5dc74d82a8adbf0d9708f9607ec4db696ccfd9..11e7999249b154079d5ac565bab7fd53c026f580 100644
--- a/test/built-ins/WeakMap/prototype/delete/length.js
+++ b/test/built-ins/WeakMap/prototype/delete/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   WeakMap.prototype.delete.length value and writability.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/name.js b/test/built-ins/WeakMap/prototype/delete/name.js
index 31d28f728d96dd7e1f8668fb8d189ecf681eeb8c..81d77c6424606a4438aeec7cf63f25f2d457b124 100644
--- a/test/built-ins/WeakMap/prototype/delete/name.js
+++ b/test/built-ins/WeakMap/prototype/delete/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   WeakMap.prototype.delete.name value and writability.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/returns-false-value-is-not-object.js b/test/built-ins/WeakMap/prototype/delete/returns-false-value-is-not-object.js
index b51ce2588322909bb7bf42bba3fb367137aa0c8c..d8db0d8c62d305ab7668ac4c6b283440ca41e4e4 100644
--- a/test/built-ins/WeakMap/prototype/delete/returns-false-value-is-not-object.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Return false if value is not an Object.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/returns-false-when-delete-is-noop.js b/test/built-ins/WeakMap/prototype/delete/returns-false-when-delete-is-noop.js
index 2e0bee90921a68cc36ee857e1d8d633fcf46c8ba..6ec472637fe75b1eb955dd3672c11a6315f966c0 100644
--- a/test/built-ins/WeakMap/prototype/delete/returns-false-when-delete-is-noop.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: >
   Return false if entry is not in the WeakMap.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-boolean.js b/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-boolean.js
index cdb94487c1cf54720917ec7dfd50816bcf8b62c6..e2efb8dd053d9fe98dfad04f58305867c40d0f8b 100644
--- a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-boolean.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.delete ( value )
diff --git a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-null.js b/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-null.js
index 0cdb8ae6817e36287e8aaed4fca748fbe1979dab..f87b0b342e3a0430db20c98b39f0e20d118fa607 100644
--- a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-null.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.delete ( value )
diff --git a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-number.js b/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-number.js
index 2143ede79d9fb5358a16f19aacb7dc0da1f9aeb5..3a42de14449cbb082b870154b93dd776c30748fa 100644
--- a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-number.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.delete ( value )
diff --git a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-string.js b/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-string.js
index 1ee40def3c081894fa93d8975e729ae95f9e53af..f47f616372e72f5b61c67f660a49416b20f92794 100644
--- a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-string.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.delete ( value )
diff --git a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-symbol.js b/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-symbol.js
index a368da9d6c38c78f15de20fe98b3394100f9b73a..271c5fcd9362b29e6425e0b39aabc77095bfc253 100644
--- a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-symbol.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.delete ( value )
diff --git a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-undefined.js b/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-undefined.js
index 30317c132d1a7e20d684d17c9f96eaaf95d0edf4..d5df0228b2ecdcc4535ef016731c6468d9f724f2 100644
--- a/test/built-ins/WeakMap/prototype/delete/this-not-object-throw-undefined.js
+++ b/test/built-ins/WeakMap/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.3.3.2
+esid: sec-weakmap.prototype.delete
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.delete ( value )
diff --git a/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-map.js b/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-map.js
index 1bbc12bcc268687d4b41f491bb6c4684237fde3a..a5f0d16988cee0579669f25f8a6701f881b53494 100644
--- a/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-map.js
+++ b/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-map.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Throws a TypeError if `this` is a Map object.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-set.js b/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-set.js
index a317baf680106af67c837655791d33b7d581587a..7d5b389f3a2c85d45e27f089db3deca9e8a67baf 100644
--- a/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-set.js
+++ b/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot-set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Throws a TypeError if `this` is a Set object.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot.js b/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot.js
index aebef875697c3a3cffc3e7dd966cb901e8e87460..160d171417a12f13f815c737a732f37221eb8577 100644
--- a/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot.js
+++ b/test/built-ins/WeakMap/prototype/get/does-not-have-weakmapdata-internal-slot.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Throws a TypeError if `this` does not have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/get.js b/test/built-ins/WeakMap/prototype/get/get.js
index e2610284de761a57779b3cdab019a48bb6eed631..0cafbec64899f1abd802dd628dbdae34aaccb922 100644
--- a/test/built-ins/WeakMap/prototype/get/get.js
+++ b/test/built-ins/WeakMap/prototype/get/get.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Property type and descriptor.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/length.js b/test/built-ins/WeakMap/prototype/get/length.js
index 48ed357af2ca04e2a2f146216fc6eec9799cf5b3..42fc1b4765dd6515281ac3b995d6ad4772e54062 100644
--- a/test/built-ins/WeakMap/prototype/get/length.js
+++ b/test/built-ins/WeakMap/prototype/get/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   WeakMap.prototype.get.length value and descriptor.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/name.js b/test/built-ins/WeakMap/prototype/get/name.js
index 28ed494c1e767eed6c578812355b516eeab46a31..4ec643c0d184fd4efbd6228379b6314c483c1dc8 100644
--- a/test/built-ins/WeakMap/prototype/get/name.js
+++ b/test/built-ins/WeakMap/prototype/get/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   WeakMap.prototype.get.name value and descriptor.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/returns-undefined-key-is-not-object.js b/test/built-ins/WeakMap/prototype/get/returns-undefined-key-is-not-object.js
index 07852697568039e271c399083d506525eef047cd..bfe4097f0f22be3fe70bd58a03e7454db28a53d5 100644
--- a/test/built-ins/WeakMap/prototype/get/returns-undefined-key-is-not-object.js
+++ b/test/built-ins/WeakMap/prototype/get/returns-undefined-key-is-not-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Returns undefined when key is not an Object.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/returns-undefined.js b/test/built-ins/WeakMap/prototype/get/returns-undefined.js
index ff3b22cd6a03e6e34d312ca62c135f2e0336eeb8..6cb67b59aa0262a757110ecbe180cda9d7d39dbc 100644
--- a/test/built-ins/WeakMap/prototype/get/returns-undefined.js
+++ b/test/built-ins/WeakMap/prototype/get/returns-undefined.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Returns undefined when key is not on the WeakMap object.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/returns-value.js b/test/built-ins/WeakMap/prototype/get/returns-value.js
index 143e641219ac177cf63ef6d8f939ad2a00a6a788..6e95f03ffa4f4dda708ac5e9d452681b10f8c24e 100644
--- a/test/built-ins/WeakMap/prototype/get/returns-value.js
+++ b/test/built-ins/WeakMap/prototype/get/returns-value.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Returns the value from the specified key
 info: >
diff --git a/test/built-ins/WeakMap/prototype/get/this-not-object-throw.js b/test/built-ins/WeakMap/prototype/get/this-not-object-throw.js
index 7113ae22f27d4bef5bb4c5fe42011e00cbc17371..4ba3fb86627e7b4f2d8811e340bd60d85195e4c5 100644
--- a/test/built-ins/WeakMap/prototype/get/this-not-object-throw.js
+++ b/test/built-ins/WeakMap/prototype/get/this-not-object-throw.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.3
+esid: sec-weakmap.prototype.get
 description: >
   Throws a TypeError if `this` value is not an Object.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-array.js b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-array.js
index 33dc84e34205bc70701e9d9c4a3ed786a9f233e9..0e357143f7e303321de2059eb31a4726e1ffe960 100644
--- a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-array.js
+++ b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-array.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-map.js b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-map.js
index 5fd060eac756e9c1ec011ca4a3e1b245438404eb..abd1cc5ea694ce879a8a34421b698e5ed75e556c 100644
--- a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-map.js
+++ b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-map.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-object.js b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-object.js
index 013b2478702e6eb1de8193e1e2a61eb464ae140e..80d7edcea980d4973e7ef13433a08157bd3b9dc2 100644
--- a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-object.js
+++ b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-set.js b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-set.js
index 1f9bb68aeed5a8e427661a7aec400900b0ba7827..c1c8f64167851e281f290d991ffc4fb815107de3 100644
--- a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-set.js
+++ b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
index 297b9da18301a85d446d9a6d9548d1aac0291f16..845096ac84d6a65057deddad7ac236084bc1edb9 100644
--- a/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
+++ b/test/built-ins/WeakMap/prototype/has/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/has.js b/test/built-ins/WeakMap/prototype/has/has.js
index 9567bb7cf7cbdab7225af657a4c56b825c383d0b..3316f893f9f9ff9c65bea38d9a83f3e646dd949c 100644
--- a/test/built-ins/WeakMap/prototype/has/has.js
+++ b/test/built-ins/WeakMap/prototype/has/has.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   WeakMap.prototype.has property descriptor
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/length.js b/test/built-ins/WeakMap/prototype/has/length.js
index 17291222b98a0463227c5bcf2f7eba220163cc57..c9007978cebfe590a4539d66d8f64efbdc499e5f 100644
--- a/test/built-ins/WeakMap/prototype/has/length.js
+++ b/test/built-ins/WeakMap/prototype/has/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   WeakMap.prototype.has.length value and writability.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/name.js b/test/built-ins/WeakMap/prototype/has/name.js
index 04c7c0e0fd69199b8d5945909affb855bfab52ee..8d68b08e0b5a1a513a0adaafb315c2d423d02ee4 100644
--- a/test/built-ins/WeakMap/prototype/has/name.js
+++ b/test/built-ins/WeakMap/prototype/has/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   WeakMap.prototype.has.name value and writability.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/returns-false-when-value-is-not-object.js b/test/built-ins/WeakMap/prototype/has/returns-false-when-value-is-not-object.js
index e721e1506921eb138eac9538987e9cc4e6a21e64..9ca418dca799dce6b90cc71f11dc507abfde4461 100644
--- a/test/built-ins/WeakMap/prototype/has/returns-false-when-value-is-not-object.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Returns false if value is not an Object.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/returns-false-when-value-not-present.js b/test/built-ins/WeakMap/prototype/has/returns-false-when-value-not-present.js
index adce12027d2488fe4037c6a38898b2323b1893fa..0f5bada75186e00aaa9f0a6141a6819485473cd2 100644
--- a/test/built-ins/WeakMap/prototype/has/returns-false-when-value-not-present.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Return false when value is not present in the WeakMap entries.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/returns-true-when-value-present.js b/test/built-ins/WeakMap/prototype/has/returns-true-when-value-present.js
index 07724ea278accd8ba597e5d89f56a6cd0c0ee2f6..1413ec0ac45dbeeaabeba11ea2573f4f25c99e36 100644
--- a/test/built-ins/WeakMap/prototype/has/returns-true-when-value-present.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: >
   Returns true when value is present in the WeakMap entries list.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-boolean.js b/test/built-ins/WeakMap/prototype/has/this-not-object-throw-boolean.js
index 6d6f862f02495b3f1157e7f301ab2e5c1112eb68..bd6e3238860d58e8e675d82d5f7e5c166023ca91 100644
--- a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-boolean.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.has ( value )
diff --git a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-null.js b/test/built-ins/WeakMap/prototype/has/this-not-object-throw-null.js
index 8f7863016f75e427a4cdf583edadadd7ca91731b..93b9c5b9d4459f7f4df045979de597fe0fe7a809 100644
--- a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-null.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.has ( value )
diff --git a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-number.js b/test/built-ins/WeakMap/prototype/has/this-not-object-throw-number.js
index b6bb5c9830dd8566bcdefdf72e7a1f9cfc4cdd2f..63bad8a200ff5c94a385a24369a939ab5c9dd30c 100644
--- a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-number.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.has ( value )
diff --git a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-string.js b/test/built-ins/WeakMap/prototype/has/this-not-object-throw-string.js
index 5b44cdb08d4c25ff28b2e1459524179c77ac4572..3e6002431bada0620d8609a384815c8cc0aa99cc 100644
--- a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-string.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.has ( value )
diff --git a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-symbol.js b/test/built-ins/WeakMap/prototype/has/this-not-object-throw-symbol.js
index 1eb3680cbc406923dcbcc1de0a81948ed8d26cae..b19e47446734c1a25f911e26735990e3ef121baa 100644
--- a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-symbol.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.has ( value )
diff --git a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-undefined.js b/test/built-ins/WeakMap/prototype/has/this-not-object-throw-undefined.js
index 2c8fb4be06ccc3496b9322c28889b6b4bd46cc3c..89f80c0c0d46d78e57c9eec95a54c01ad516cb42 100644
--- a/test/built-ins/WeakMap/prototype/has/this-not-object-throw-undefined.js
+++ b/test/built-ins/WeakMap/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.3.3.4
+esid: sec-weakmap.prototype.has
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.has ( value )
diff --git a/test/built-ins/WeakMap/prototype/prototype-attributes.js b/test/built-ins/WeakMap/prototype/prototype-attributes.js
index 19941f4ce52a123aecb6b022bd36fa12abcb04bc..5d2670ccdff7775786c03f1d301974a54ce7be44 100644
--- a/test/built-ins/WeakMap/prototype/prototype-attributes.js
+++ b/test/built-ins/WeakMap/prototype/prototype-attributes.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.2.1
+esid: sec-weakmap.prototype
 description: >
   WeakMap.prototype is not writable, not enumerable and not configurable.
 includes: [propertyHelper.js]
diff --git a/test/built-ins/WeakMap/prototype/set/adds-element.js b/test/built-ins/WeakMap/prototype/set/adds-element.js
index 0b0d86f63e4d20ddc9d2576fa515cf87dc8e6871..da8e1fd9a0cd240a8eea88092f2a7a227e24b291 100644
--- a/test/built-ins/WeakMap/prototype/set/adds-element.js
+++ b/test/built-ins/WeakMap/prototype/set/adds-element.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: >
   Appends value as the last element of entries.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-array.js b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-array.js
index b98e11d2fda6fd2fa07f9476d88c2b6677350260..adf7c99b81b14961e0c6ad16f68a26cb15c4ed2b 100644
--- a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-array.js
+++ b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-array.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-map.js b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-map.js
index b17dbc7f63e749ee9ab27283630b3429bd4c4ed0..0b710c2aa79c024e7790c328d81404e1cb486993 100644
--- a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-map.js
+++ b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-map.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-object.js b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-object.js
index 5adc57bc5946acf2ab9d5cd881478efb8cfda294..03f9385d4cf06e817c200f7edd1426566ac39513 100644
--- a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-object.js
+++ b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-object.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-set.js b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-set.js
index 0ef36a59371abb605399a37eaa0bc37e1d86ce30..800dc1b344cf80ace40e2118e095369669447fb2 100644
--- a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-set.js
+++ b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
index 59d4308dde8b85072751146d3f48ad6cddfcbc74..871cc2c4e0d412d4ffc25b289e4b526759bf809e 100644
--- a/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
+++ b/test/built-ins/WeakMap/prototype/set/does-not-have-weakmapdata-internal-slot-weakmap-prototype.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: >
   Throws TypeError if `this` doesn't have a [[WeakMapData]] internal slot.
 info: >
diff --git a/test/built-ins/WeakMap/prototype/set/key-not-object-throw.js b/test/built-ins/WeakMap/prototype/set/key-not-object-throw.js
index 4b4031d1c58433f6d80bebfccd506e2f0a74da75..047914fcfd4e373410615dd6989b32384fe5d8b8 100644
--- a/test/built-ins/WeakMap/prototype/set/key-not-object-throw.js
+++ b/test/built-ins/WeakMap/prototype/set/key-not-object-throw.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: Throws TypeError if `key` is not Object.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/length.js b/test/built-ins/WeakMap/prototype/set/length.js
index 0d687e51f21fda4ac3428a24cd14b571331d6644..39cfab1986776ba0033fd311ac931e52f8ffe0b1 100644
--- a/test/built-ins/WeakMap/prototype/set/length.js
+++ b/test/built-ins/WeakMap/prototype/set/length.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: WeakMap.prototype.set.length descriptor
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/name.js b/test/built-ins/WeakMap/prototype/set/name.js
index 9c4f63080fe4ccd8d6974908702d1a47573992bf..eb58a71ea8971566a379c3f8e761487c268a21b0 100644
--- a/test/built-ins/WeakMap/prototype/set/name.js
+++ b/test/built-ins/WeakMap/prototype/set/name.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: WeakMap.prototype.set.name descriptor
 info: >
   WeakMap.prototype.set ( value )
diff --git a/test/built-ins/WeakMap/prototype/set/returns-this-when-ignoring-duplicate.js b/test/built-ins/WeakMap/prototype/set/returns-this-when-ignoring-duplicate.js
index b7221250469dd1a3178c2fca14cd2977969a24a4..384ca455a528dfbb2baa2102e56336e32d931e49 100644
--- a/test/built-ins/WeakMap/prototype/set/returns-this-when-ignoring-duplicate.js
+++ b/test/built-ins/WeakMap/prototype/set/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.3.3.5
+esid: sec-weakmap.prototype.set
 description: Returns `this` when new value is duplicate.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/returns-this.js b/test/built-ins/WeakMap/prototype/set/returns-this.js
index d92c5fc801973e92ea9d5b76ccf8315f54f62a73..dec9bf49e601719d309bb9ab2ecd2aa671d29d39 100644
--- a/test/built-ins/WeakMap/prototype/set/returns-this.js
+++ b/test/built-ins/WeakMap/prototype/set/returns-this.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: Returns `this` after setting a new value.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/set.js b/test/built-ins/WeakMap/prototype/set/set.js
index 173b3e0ebf122f36291dc7ad2eeb9a3f70a9cc97..2ac5058053e426f3a3a962f34c15821c34b70f40 100644
--- a/test/built-ins/WeakMap/prototype/set/set.js
+++ b/test/built-ins/WeakMap/prototype/set/set.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.3.5
+esid: sec-weakmap.prototype.set
 description: WeakMap.prototype.set property descriptor
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-boolean.js b/test/built-ins/WeakMap/prototype/set/this-not-object-throw-boolean.js
index e36b6201e7e577f075486027e0078786fab53fe3..261b4a8a85ba8dbb1ef0bd0d978cf921e13ecb5b 100644
--- a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-boolean.js
+++ b/test/built-ins/WeakMap/prototype/set/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.3.3.5
+esid: sec-weakmap.prototype.set
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-null.js b/test/built-ins/WeakMap/prototype/set/this-not-object-throw-null.js
index dba5205606adf3df32d4ce8925559b4980d00d9a..0109bae4c49e9508b034c785b7471e3b6c039db5 100644
--- a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-null.js
+++ b/test/built-ins/WeakMap/prototype/set/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.3.3.5
+esid: sec-weakmap.prototype.set
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-number.js b/test/built-ins/WeakMap/prototype/set/this-not-object-throw-number.js
index e4745ca50e50b3367cbacc425c67e34ace8618e6..a71a1dd3705126700750f67b9c94cdf2377a31f2 100644
--- a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-number.js
+++ b/test/built-ins/WeakMap/prototype/set/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.3.3.5
+esid: sec-weakmap.prototype.set
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-string.js b/test/built-ins/WeakMap/prototype/set/this-not-object-throw-string.js
index 8764b24258ac6c9537809f440d9c1c1195ccea11..c5a011ada840950a2f9d5f7e26c9d7ba36578dd8 100644
--- a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-string.js
+++ b/test/built-ins/WeakMap/prototype/set/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.3.3.5
+esid: sec-weakmap.prototype.set
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-symbol.js b/test/built-ins/WeakMap/prototype/set/this-not-object-throw-symbol.js
index c7f1cfe453808cd90da21bb80befd148bb79006f..c90048b730e100e7cee569a934e4b92593812ed4 100644
--- a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-symbol.js
+++ b/test/built-ins/WeakMap/prototype/set/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.3.3.5
+esid: sec-weakmap.prototype.set
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-undefined.js b/test/built-ins/WeakMap/prototype/set/this-not-object-throw-undefined.js
index 4c8d0fdfff9cbbb6fe59f0d7260fd29de3028c98..e620963df414b94cfb4b82fd947b0c8625670bbf 100644
--- a/test/built-ins/WeakMap/prototype/set/this-not-object-throw-undefined.js
+++ b/test/built-ins/WeakMap/prototype/set/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.3.3.5
+esid: sec-weakmap.prototype.set
 description: Throws TypeError if `this` is not Object.
 info: >
   WeakMap.prototype.set ( key, value )
diff --git a/test/built-ins/WeakMap/set-not-callable-throws.js b/test/built-ins/WeakMap/set-not-callable-throws.js
index db6c76586a1d5f52a5fea4752e2854901a89fed9..2487cce679258a0a705c2ed766c849bb2fafe0f9 100644
--- a/test/built-ins/WeakMap/set-not-callable-throws.js
+++ b/test/built-ins/WeakMap/set-not-callable-throws.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Throws TypeError if add is not callable on constructor call.
 info: >
diff --git a/test/built-ins/WeakMap/undefined-newtarget.js b/test/built-ins/WeakMap/undefined-newtarget.js
index d7b5b1bd135359d4fe31f24564788c2527a9d135..aa9144aa1dd6cbc1d6dc222978f402e7d63a68a1 100644
--- a/test/built-ins/WeakMap/undefined-newtarget.js
+++ b/test/built-ins/WeakMap/undefined-newtarget.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   Throws a TypeError if NewTarget is undefined.
 info: >
diff --git a/test/built-ins/WeakMap/weakmap.js b/test/built-ins/WeakMap/weakmap.js
index 6a67915180025b0d2d92c93a261ad6280f6cdf69..898f83436e908b03cf5106d0e239634890da0bb4 100644
--- a/test/built-ins/WeakMap/weakmap.js
+++ b/test/built-ins/WeakMap/weakmap.js
@@ -2,6 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 es6id: 23.3.1.1
+esid: sec-weakmap-iterable
 description: >
   WeakMap ( [ iterable ] )