diff --git a/test/annexB/B.2.1.js b/test/annexB/B.2.1.js
index 1b86820cac95879c1b2f356ea698a1e83cfc5534..ec12dc44c8b9fd46686e89b40fcd30eff801800a 100644
--- a/test/annexB/B.2.1.js
+++ b/test/annexB/B.2.1.js
@@ -5,6 +5,7 @@
 // copyright and this notice and otherwise comply with the Use Terms.
 
 /*---
+es5id: B.2.1
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (Global.escape)
diff --git a/test/annexB/B.2.1.propertyCheck.js b/test/annexB/B.2.1.propertyCheck.js
index a3262b8bd1ef376dc8152a81460eb919e2cf1924..9d1179c4e0c7f3e85d49105c96b361fc3c15b1ae 100644
--- a/test/annexB/B.2.1.propertyCheck.js
+++ b/test/annexB/B.2.1.propertyCheck.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Check type of various properties
+es5id: B.2.1
 description: Checking properties of this object (escape)
 ---*/
 
diff --git a/test/annexB/B.2.2.js b/test/annexB/B.2.2.js
index 18e9abc6e2ee87051d1c1e6f41b17570bec0480d..f890c8237c904b0a9b0c20013a768054cf6c6d41 100644
--- a/test/annexB/B.2.2.js
+++ b/test/annexB/B.2.2.js
@@ -5,6 +5,7 @@
 // copyright and this notice and otherwise comply with the Use Terms.
 
 /*---
+es5id: B.2.2
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (Global.unescape)
diff --git a/test/annexB/B.2.2.propertyCheck.js b/test/annexB/B.2.2.propertyCheck.js
index 3104670f0b63817d916cb861c684b5e126cd2706..bd3f6e56e9c349a88e8f984cdb3dd2eabfa3636a 100644
--- a/test/annexB/B.2.2.propertyCheck.js
+++ b/test/annexB/B.2.2.propertyCheck.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Check type of various properties
+es5id: B.2.2
 description: Checking properties of this object (unescape)
 ---*/
 
diff --git a/test/annexB/B.2.3.js b/test/annexB/B.2.3.js
index b08f4bf160efdd76314bd8011a41a0e5768f0fb7..7984d96386edc5726e679440cbfc7dd3663154a3 100644
--- a/test/annexB/B.2.3.js
+++ b/test/annexB/B.2.3.js
@@ -5,6 +5,7 @@
 // copyright and this notice and otherwise comply with the Use Terms.
 
 /*---
+es5id: B.2.3
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (String.prototype.substr)
diff --git a/test/annexB/B.2.4.js b/test/annexB/B.2.4.js
index d745bc4d564f7acd33bc9921d56bc347f52ca942..37c2b4b8b5cb42e9097cd070e759736b4ed726c5 100644
--- a/test/annexB/B.2.4.js
+++ b/test/annexB/B.2.4.js
@@ -5,6 +5,7 @@
 // copyright and this notice and otherwise comply with the Use Terms.
 
 /*---
+es5id: B.2.4
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (Date.prototype.getYear)
diff --git a/test/annexB/B.2.4.propertyCheck.js b/test/annexB/B.2.4.propertyCheck.js
index e0a7f1a1de937faca27a3a28d50ccbfaae4d92f2..38223ba3d06ea74a47a429e2947cf449b21f786c 100644
--- a/test/annexB/B.2.4.propertyCheck.js
+++ b/test/annexB/B.2.4.propertyCheck.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Check type of various properties
+es5id: B.2.4
 description: Checking properties of the Date object (getYear)
 ---*/
 
diff --git a/test/annexB/B.2.5.js b/test/annexB/B.2.5.js
index a977fd5c84cc1672e8a663c2af408a071eab3ce5..464f0358ffa52d483cc874c9c3093d2ea810b81b 100644
--- a/test/annexB/B.2.5.js
+++ b/test/annexB/B.2.5.js
@@ -5,6 +5,7 @@
 // copyright and this notice and otherwise comply with the Use Terms.
 
 /*---
+es5id: B.2.5
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (Date.prototype.setYear)
diff --git a/test/annexB/B.2.5.propertyCheck.js b/test/annexB/B.2.5.propertyCheck.js
index 562a8ade28da6f76a44dc3e128bbfa2e450672b8..40a4ae33763f5a1986f60524c7e71ef50e6fd6bb 100644
--- a/test/annexB/B.2.5.propertyCheck.js
+++ b/test/annexB/B.2.5.propertyCheck.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Check type of various properties
+es5id: B.2.5
 description: Checking properties of the Date object (setYear)
 ---*/
 
diff --git a/test/annexB/B.2.6.js b/test/annexB/B.2.6.js
index b767a50f8bf92e0b26ba8b9b2bb3e9aded1e0e38..92a7c4768f3e21ab45988fcb6058bdfbe3d81f41 100644
--- a/test/annexB/B.2.6.js
+++ b/test/annexB/B.2.6.js
@@ -5,6 +5,7 @@
 // copyright and this notice and otherwise comply with the Use Terms.
 
 /*---
+es5id: B.2.6
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (Date.prototype.toGMTString)
diff --git a/test/annexB/B.2.6.propertyCheck.js b/test/annexB/B.2.6.propertyCheck.js
index 82676c804aa04b47efe04ed8be95753745cfebf1..d09596d9e4fe4e02b405678f145c8bfada4fe71e 100644
--- a/test/annexB/B.2.6.propertyCheck.js
+++ b/test/annexB/B.2.6.propertyCheck.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Check type of various properties
+es5id: B.2.6
 description: Checking properties of the Date object (toGMTString)
 ---*/
 
diff --git a/test/annexB/B.RegExp.prototype.compile.js b/test/annexB/B.RegExp.prototype.compile.js
index 43ce91ff7e889b1ab7157e9a2bbd394f1b5ba35d..e90f98b7bd40cba557c7681f2a2ab9e32bbf1b20 100644
--- a/test/annexB/B.RegExp.prototype.compile.js
+++ b/test/annexB/B.RegExp.prototype.compile.js
@@ -5,6 +5,7 @@
 // copyright and this notice and otherwise comply with the Use Terms.
 
 /*---
+es6id: B.2.5.1
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (RegExp.prototype.compile)
diff --git a/test/built-ins/Array/from/S22.1.2.1_T1.js b/test/built-ins/Array/from/S22.1.2.1_T1.js
index 21b10c51d6a851aee91eeac58597ba44a3daf8ef..c35877b4526b8cf600a747cb4353682df9bb6b82 100644
--- a/test/built-ins/Array/from/S22.1.2.1_T1.js
+++ b/test/built-ins/Array/from/S22.1.2.1_T1.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-es5id: 22.1.2.1_T1
+es6id: 22.1.2.1_T1
 description: Testing Array.from when passed a String
 author: Hank Yates (hankyates@gmail.com)
 includes: [runTestCase.js]
diff --git a/test/built-ins/Array/from/S22.1.2.1_T2.js b/test/built-ins/Array/from/S22.1.2.1_T2.js
index c00c8bb301fab9ed18c476da50da767d39043a03..827b00360f4278c3bbc7f29b97a354acba80b6fb 100644
--- a/test/built-ins/Array/from/S22.1.2.1_T2.js
+++ b/test/built-ins/Array/from/S22.1.2.1_T2.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-es5id: 22.1.2.1_T2
+es6id: 22.1.2.1_T2
 description: Testing Array.from when passed an Object is passed
 author: Hank Yates (hankyates@gmail.com)
 includes: [runTestCase.js]
diff --git a/test/built-ins/Array/from/S22.1.2.1_T3.js b/test/built-ins/Array/from/S22.1.2.1_T3.js
index 057fd4821c7fa18cb42225c59c40774b5f4a6d94..0299f36231f3ea88fa968779cf919f504f034df1 100644
--- a/test/built-ins/Array/from/S22.1.2.1_T3.js
+++ b/test/built-ins/Array/from/S22.1.2.1_T3.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-es5id: 22.1.2.1_T3
+es6id: 22.1.2.1_T3
 description: Testing Array.from when passed an undefined
 author: Hank Yates (hankyates@gmail.com)
 includes: [runTestCase.js]
diff --git a/test/built-ins/Array/of/S22.1.2.3_T1.js b/test/built-ins/Array/of/S22.1.2.3_T1.js
index 6e9ae86f1effee402c07ee86a54b15a18dbc1748..aad1f8f68c0e49405185dd60ef4621921ebf4049 100644
--- a/test/built-ins/Array/of/S22.1.2.3_T1.js
+++ b/test/built-ins/Array/of/S22.1.2.3_T1.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-es5id: 22.1.2.3_T1
+es6id: 22.1.2.3_T1
 description: Testing Array#of when passed Strings
 author: Hank Yates (hankyates@gmail.com)
 includes: [runTestCase.js]
diff --git a/test/built-ins/Array/of/S22.1.2.3_T2.js b/test/built-ins/Array/of/S22.1.2.3_T2.js
index 5fca44e64e06822bf7152289924d250a3a31ef63..b75a66b3fbf635b26a11e177169ca7a0890b927c 100644
--- a/test/built-ins/Array/of/S22.1.2.3_T2.js
+++ b/test/built-ins/Array/of/S22.1.2.3_T2.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-es5id: 22.1.2.3_T2
+es6id: 22.1.2.3_T2
 description: Testing Array#of when passed single argument
 author: Hank Yates (hankyates@gmail.com)
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/clz32/Math.clz32.js b/test/built-ins/Math/clz32/Math.clz32.js
index 17081cb6dfe0b6d064ab03bba28b17e746e0f81c..9bc4cb8e7ded133285ca353e7edc5357d634b0d8 100644
--- a/test/built-ins/Math/clz32/Math.clz32.js
+++ b/test/built-ins/Math/clz32/Math.clz32.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.11
 author: Ryan Lewis
 description: Math.clz32 should return 32 if passed 0.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/clz32/Math.clz32_1.js b/test/built-ins/Math/clz32/Math.clz32_1.js
index 010669b31156663100433c389956daadfb02dd42..821f22e2af4f52811b2fc277fb19293dcfa338c4 100644
--- a/test/built-ins/Math/clz32/Math.clz32_1.js
+++ b/test/built-ins/Math/clz32/Math.clz32_1.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.11
 author: Ryan Lewis
 description: Math.clz32 should return 31 if passed 1.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/clz32/Math.clz32_2.js b/test/built-ins/Math/clz32/Math.clz32_2.js
index d213eafe4ac6a08c77374a3f00f6f158b1dd14af..85af7fa045ccc10d108b6a28b0952aa37695b867 100644
--- a/test/built-ins/Math/clz32/Math.clz32_2.js
+++ b/test/built-ins/Math/clz32/Math.clz32_2.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.11
 author: Ryan Lewis
 description: Math.clz32 should return 0 if passed 2147483648
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/fround/Math.fround_Infinity.js b/test/built-ins/Math/fround/Math.fround_Infinity.js
index d54d635d171d86edd953181cc8c5aa879598bc4b..fd110a040bdc6649cfec018c35b9b50b08b577cd 100644
--- a/test/built-ins/Math/fround/Math.fround_Infinity.js
+++ b/test/built-ins/Math/fround/Math.fround_Infinity.js
@@ -5,6 +5,7 @@
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.17
 author: Ryan Lewis
 description: Math.fround should return Infinity if called with Infinity.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/fround/Math.fround_NaN.js b/test/built-ins/Math/fround/Math.fround_NaN.js
index aa6f1cf3feb38066c721f879c1f797f877e74a18..a85c829353f938847644f400e4ce9fec90ba6316 100644
--- a/test/built-ins/Math/fround/Math.fround_NaN.js
+++ b/test/built-ins/Math/fround/Math.fround_NaN.js
@@ -5,6 +5,7 @@
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.17
 author: Ryan Lewis
 description: Math.fround should return NaN if called with NaN.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/fround/Math.fround_Zero.js b/test/built-ins/Math/fround/Math.fround_Zero.js
index b314b57c56b35e64205cec0f3bd1169d5a98ab09..cd472992b22ee93c9e39899b4cf68cf7e1fabfe2 100644
--- a/test/built-ins/Math/fround/Math.fround_Zero.js
+++ b/test/built-ins/Math/fround/Math.fround_Zero.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.17
 author: Ryan Lewis
 description: Math.fround should return 0 if called with 0.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/hypot/Math.hypot_Infinity.js b/test/built-ins/Math/hypot/Math.hypot_Infinity.js
index ebbe2bb4abe3200d1464d58eb2bd2902d4802c13..41bedda854b4b0de467056e5d3e05d119edd4edc 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Infinity.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Infinity.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: >
     Math.hypot should return Infinity if called with any argument that
diff --git a/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js b/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js
index 568f33f0b00ac25b3b3bedc35e4c0ad4388916ff..b3e5470c32316c1c56700682f384deea9ac99278 100644
--- a/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js
+++ b/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: >
     Math.hypot should return Infinity if called with any argument that
diff --git a/test/built-ins/Math/hypot/Math.hypot_NaN.js b/test/built-ins/Math/hypot/Math.hypot_NaN.js
index d41fb1730ec9a2d08d825ba65bff01e6e070b049..32711132bb405212eb714587ff90c646b483c9fa 100644
--- a/test/built-ins/Math/hypot/Math.hypot_NaN.js
+++ b/test/built-ins/Math/hypot/Math.hypot_NaN.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: >
     Math.hypot should return NaN if called with any argument that is
diff --git a/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js b/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js
index 3ba99708c37f71e622f88940c1a6f7c1a9c91752..709d31f649eabe47cb95ae4f64ebad155c457450 100644
--- a/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js
+++ b/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: >
     Math.hypot should return Infinity if called with any argument that
diff --git a/test/built-ins/Math/hypot/Math.hypot_NoArgs.js b/test/built-ins/Math/hypot/Math.hypot_NoArgs.js
index 6150777095be0d474322ca03e9f4d380c46f8b54..67a3fca9264f98b407102406d77a7488cc676023 100644
--- a/test/built-ins/Math/hypot/Math.hypot_NoArgs.js
+++ b/test/built-ins/Math/hypot/Math.hypot_NoArgs.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 0 if called with no arguments.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/hypot/Math.hypot_Success.js b/test/built-ins/Math/hypot/Math.hypot_Success.js
index da4ba3b24a2a707bc51a0318f8c75da23aefbb62..46a93f6d86c4434266422ec7d905e6880bde20cd 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Success.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Success.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 4 if called with 3 and 2.6457513110645907.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/hypot/Math.hypot_Success_2.js b/test/built-ins/Math/hypot/Math.hypot_Success_2.js
index e80842eed8c98912c766af7d19004c012c8315ea..0c910d06c902d2007fb46425103146cb77f58e89 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Success_2.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Success_2.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 5 if called with 3 and 4.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/hypot/Math.hypot_Zero_2.js b/test/built-ins/Math/hypot/Math.hypot_Zero_2.js
index c5eb3c290a4fc698d6dc0b026d8c5777f768772d..971053af44ea75324115a8e0767eb25813cd5657 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Zero_2.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Zero_2.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 0 if called with all arguments being 0.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/hypot/Math.hypot_lengthProp.js b/test/built-ins/Math/hypot/Math.hypot_lengthProp.js
index cb363be0b0316f2ddebbfa8f97daf3bcdea0761b..4acd1fcd7570aa6f1bed683b84cdb25a808e5456 100644
--- a/test/built-ins/Math/hypot/Math.hypot_lengthProp.js
+++ b/test/built-ins/Math/hypot/Math.hypot_lengthProp.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot.length should return 2.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/trunc/Math.trunc_Infinity.js b/test/built-ins/Math/trunc/Math.trunc_Infinity.js
index 99ecf4c57eb36f42dbd5988cee7998ad603db77d..5c0166e7b7e0db8cf673395c3814f9b943e9960e 100644
--- a/test/built-ins/Math/trunc/Math.trunc_Infinity.js
+++ b/test/built-ins/Math/trunc/Math.trunc_Infinity.js
@@ -5,6 +5,7 @@
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return Infinity when called with Infinity.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/trunc/Math.trunc_NaN.js b/test/built-ins/Math/trunc/Math.trunc_NaN.js
index c2b1a06c0248086feed0e98efbdec10c962c5729..e2d13c6f407980e3549427b7a70bdbf89e3de386 100644
--- a/test/built-ins/Math/trunc/Math.trunc_NaN.js
+++ b/test/built-ins/Math/trunc/Math.trunc_NaN.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return NaN when called with NaN.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js b/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js
index a9ef33f88c9134c3024ca966acde05a0be7d75db..148f12c7d2fef541fa5e55b06cb1c74588b071f9 100644
--- a/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js
+++ b/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return 0 if called with a value between 0 and -1.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js b/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js
index f43b7250e2c5eb7a5f4d9f1cf8fefbd646be5936..21b31ee957b7c9e946b87b5a35c550a564bcd254 100644
--- a/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js
+++ b/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return 0 if called with a value between 0 and 1.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/trunc/Math.trunc_Success.js b/test/built-ins/Math/trunc/Math.trunc_Success.js
index d04a11ca560babe8740c982bf2dbe873de9bd0f5..69d49d6c204b81de14dfdaff6325cb8458ac3d43 100644
--- a/test/built-ins/Math/trunc/Math.trunc_Success.js
+++ b/test/built-ins/Math/trunc/Math.trunc_Success.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return 4578 if called with 4578.584949
 includes: [runTestCase.js]
diff --git a/test/built-ins/Math/trunc/Math.trunc_Zero.js b/test/built-ins/Math/trunc/Math.trunc_Zero.js
index be34f34746487a528b767c115ee1066c21669d85..1a5933e197d5655fd4f44f56399b3dadb99a43ef 100644
--- a/test/built-ins/Math/trunc/Math.trunc_Zero.js
+++ b/test/built-ins/Math/trunc/Math.trunc_Zero.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return 0 when called with 0.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_Double.js b/test/built-ins/Number/isInteger/Number.isInteger_Double.js
index 29192d714583e5b661258ba1b383c5e9b274c7df..24b4f11cd5f7c50d69289134b7dc0bb0283e63a6 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_Double.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_Double.js
@@ -5,6 +5,7 @@
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return false if called with a double.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js b/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js
index b24e23f58001d724eab27ecd93b8215ff539b2bf..bb9d1fa1d52b278a3686e940f90349936b0564aa 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return false if called with Infinity.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_NaN.js b/test/built-ins/Number/isInteger/Number.isInteger_NaN.js
index e6b6ae1409057aca109b8aca26ed1ff1354460fa..d02e8a0c31ad1b41fe5d379c0ee1bd68baf4d2de 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_NaN.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_NaN.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return false if called with NaN.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js b/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js
index 3740f5ed2eb738f90be99e487566a7efc4e35b52..e16f03d315b7fe17c78ddc8c54ec49dbdbf1b6d6 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.3
 author: Ryan Lewis
 description: >
     Number.isInteger should return false if called with a string
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_String.js b/test/built-ins/Number/isInteger/Number.isInteger_String.js
index ac0136cf6cb6ec6177d482bc7c75786bcc416d9a..24731f45dad45ef694f6abf13728cb95f2accfb1 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_String.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_String.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.3
 author: Ryan Lewis
 description: >
     Number.isInteger should return false if called with a string
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_Success.js b/test/built-ins/Number/isInteger/Number.isInteger_Success.js
index 83ba996c119e769a3cc67922b5fb1d16cef4c5cf..cec36862f7af7afb66a66e18b5120f19a971cb3c 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_Success.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_Success.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return true if called with an integer.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Number/isNaN/Number.isNaN_Boolean.js b/test/built-ins/Number/isNaN/Number.isNaN_Boolean.js
index c81e9674f26c9db264eaf26641bf398d00aeb477..fa14e8a4d16396041123c011f921505c71af1f84 100644
--- a/test/built-ins/Number/isNaN/Number.isNaN_Boolean.js
+++ b/test/built-ins/Number/isNaN/Number.isNaN_Boolean.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.4
 author: Ryan Lewis
 description: Number.IsNaN should return false if called with a boolean.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Number/isNaN/Number.isNaN_NaN.js b/test/built-ins/Number/isNaN/Number.isNaN_NaN.js
index af24cff9d1c20097a8bdaa07d7b2045466d49ffb..51ad895f660d3e79eaab11f7e01c0b56489947fc 100644
--- a/test/built-ins/Number/isNaN/Number.isNaN_NaN.js
+++ b/test/built-ins/Number/isNaN/Number.isNaN_NaN.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.4
 author: Ryan Lewis
 description: Number.IsNaN should return true if called with NaN.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Number/isNaN/Number.isNaN_Object.js b/test/built-ins/Number/isNaN/Number.isNaN_Object.js
index 24d474ecceff1bc9a99a6de484eb643847297195..b35e6badac7b7797b7df9ab7a692302c2d5c0311 100644
--- a/test/built-ins/Number/isNaN/Number.isNaN_Object.js
+++ b/test/built-ins/Number/isNaN/Number.isNaN_Object.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.4
 author: Ryan Lewis
 description: >
     Number.IsNaN should return false if called with a non-number
diff --git a/test/built-ins/Number/isNaN/Number.isNaN_String.js b/test/built-ins/Number/isNaN/Number.isNaN_String.js
index 9e0041937eaa4d71823994a44931725fb901fabf..31cae9b26054462511e82a189919c0fb5b5f2204 100644
--- a/test/built-ins/Number/isNaN/Number.isNaN_String.js
+++ b/test/built-ins/Number/isNaN/Number.isNaN_String.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /*---
+es6id: 20.1.2.4
 author: Ryan Lewis
 description: Number.IsNaN should return false if called with a String.
 includes: [runTestCase.js]
diff --git a/test/built-ins/Promise/S25.4.3.1_A1.1_T1.js b/test/built-ins/Promise/S25.4.3.1_A1.1_T1.js
index e225c49034b44585672f3a96971f0b3203d7df22..ac5cc6d0de0700fad82c82b7a8d9de38db38a0e2 100644
--- a/test/built-ins/Promise/S25.4.3.1_A1.1_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A1.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise is the Promise property of the global object
+es6id: S25.4.3.1_A1.1_T1
 author: Sam Mikes
 description: Promise === global.Promise
 includes: [fnGlobalObject.js]
diff --git a/test/built-ins/Promise/S25.4.3.1_A2.1_T1.js b/test/built-ins/Promise/S25.4.3.1_A2.1_T1.js
index 79637f68d79d9cab991379965eea77cdb4466359..5d9752218e8d60eea56025d594d9d2c314f21504 100644
--- a/test/built-ins/Promise/S25.4.3.1_A2.1_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A2.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise throws TypeError when 'this' is not Object
+es6id: S25.4.3.1_A2.1_T1
 author: Sam Mikes
 description: Promise.call("non-object") throws TypeError
 negative: TypeError
diff --git a/test/built-ins/Promise/S25.4.3.1_A2.2_T1.js b/test/built-ins/Promise/S25.4.3.1_A2.2_T1.js
index 1f163f0fa81561ab3f5a15a03710aaa8e7766982..5d5dd221e4ca474f0dc975879fad91f8a7c2f740 100644
--- a/test/built-ins/Promise/S25.4.3.1_A2.2_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A2.2_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise throws TypeError when 'this' is constructed but unsettled promise
+es6id: S25.4.3.1_A2.2_T1
 author: Sam Mikes
 description: Promise.call(new Promise()) throws TypeError
 ---*/
diff --git a/test/built-ins/Promise/S25.4.3.1_A2.3_T1.js b/test/built-ins/Promise/S25.4.3.1_A2.3_T1.js
index 9d741cc94c70be5a46ac1fd1c3589667a55b05cd..01574d12e0f2f7e766d2ac4c332f281286591f07 100644
--- a/test/built-ins/Promise/S25.4.3.1_A2.3_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A2.3_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise throws TypeError when 'this' is resolved promise
+es6id: S25.4.3.1_A2.3_T1
 author: Sam Mikes
 description: Promise.call(resolved Promise) throws TypeError
 ---*/
diff --git a/test/built-ins/Promise/S25.4.3.1_A2.4_T1.js b/test/built-ins/Promise/S25.4.3.1_A2.4_T1.js
index 13d2abd36afb68bf1b0a279da95b87e126fc4a1d..79666fdfd52cd6b7f721632a71d2be45cb1f9131 100644
--- a/test/built-ins/Promise/S25.4.3.1_A2.4_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A2.4_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise throws TypeError when 'this' is rejected promise
+es6id: S25.4.3.1_A2.4_T1
 author: Sam Mikes
 description: Promise.call(rejected Promise) throws TypeError
 ---*/
diff --git a/test/built-ins/Promise/S25.4.3.1_A3.1_T1.js b/test/built-ins/Promise/S25.4.3.1_A3.1_T1.js
index c89edcaf52fd23181cf95698231e6efef85d064f..86094968ad45afc72075a7c53b6807cb4ec41cf2 100644
--- a/test/built-ins/Promise/S25.4.3.1_A3.1_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A3.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise throws TypeError when executor is not callable
+es6id: S25.4.3.1_A3.1_T1
 author: Sam Mikes
 description: new Promise("not callable") throws TypeError
 negative: TypeError
diff --git a/test/built-ins/Promise/S25.4.3.1_A4.1_T1.js b/test/built-ins/Promise/S25.4.3.1_A4.1_T1.js
index 4a633214b0f60e2e42a272fbad9e8f868316690e..577cb3c1fd0eefa41fc3a1a30b75dd3e4329115d 100644
--- a/test/built-ins/Promise/S25.4.3.1_A4.1_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A4.1_T1.js
@@ -5,6 +5,7 @@
 info: >
     Promise catches exceptions thrown from executor and turns
     them into reject
+es6id: S25.4.3.1_A4.1_T1
 author: Sam Mikes
 description: new Promise(function () { throw }) should reject
 ---*/
diff --git a/test/built-ins/Promise/S25.4.3.1_A5.1_T1.js b/test/built-ins/Promise/S25.4.3.1_A5.1_T1.js
index 91833104fc7f99979fba4dfa7385194a19f65fb9..5ad54e7568611823d51453303fa656885d686712 100644
--- a/test/built-ins/Promise/S25.4.3.1_A5.1_T1.js
+++ b/test/built-ins/Promise/S25.4.3.1_A5.1_T1.js
@@ -6,6 +6,7 @@ info: >
     Promise executor has predictable environment
     'this' should be global object in sloppy mode,
     undefined in strict mode
+es6id: S25.4.3.1_A5.1_T1
 author: Sam Mikes
 description: Promise executor gets default handling for 'this'
 flags: [noStrict]
diff --git a/test/built-ins/Promise/S25.4.3.1_A5.1_T2.js b/test/built-ins/Promise/S25.4.3.1_A5.1_T2.js
index 2a631835134cf5d93d3e5ed137009c31ca4f5621..a3dde91926711b8dc2ccd7279c832a915563907c 100644
--- a/test/built-ins/Promise/S25.4.3.1_A5.1_T2.js
+++ b/test/built-ins/Promise/S25.4.3.1_A5.1_T2.js
@@ -6,6 +6,7 @@ info: >
     Promise executor has predictable environment
     'this' should be global object in sloppy mode,
     undefined in strict mode
+es6id: S25.4.3.1_A5.1_T2
 author: Sam Mikes
 description: Promise executor gets default handling for 'this'
 flags: [onlyStrict]
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A1.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A1.1_T1.js
index 89fa820ef7dd964dfd0f2b8f9253174788f8cf72..597b68aa9f2f54ba41ea24e8996381970a26f4f2 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A1.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A1.1_T1.js
@@ -3,7 +3,7 @@
 
 /*---
 info: Promise.all is callable
-es5id: 25.4.4.1_A1.1_T1
+es6id: 25.4.4.1_A1.1_T1
 author: Sam Mikes
 description: Promise.all is callable
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A1.2_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A1.2_T1.js
index 83ce6f00e01cece725f97e51bfdad244be79cf10..702df887168b127acd9c016560fba25930c94b14 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A1.2_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A1.2_T1.js
@@ -3,7 +3,7 @@
 
 /*---
 info: Promise.all expects 1 argument
-es5id: 25.4.4.1_A1.2_T1
+es6id: 25.4.4.1_A1.2_T1
 author: Sam Mikes
 description: Promise.all expects 1 argument
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A2.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A2.1_T1.js
index 6a02959b72ee99f7472cfa57aa5d1111cd0bfc90..92149f2aae33b484f06e752ba695a7d9d0aded72 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A2.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A2.1_T1.js
@@ -3,7 +3,7 @@
 
 /*---
 info: Promise.all([]) is a Promise
-es5id: 25.4.4.1_A2.1_T1
+es6id: 25.4.4.1_A2.1_T1
 author: Sam Mikes
 description: Promise.all returns a Promise
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A2.2_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A2.2_T1.js
index 6c1199e128e6b630252cd7ae3bab21454a2682c4..9cd7d17154a920c7feeb57df5482bfa220a61d61 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A2.2_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A2.2_T1.js
@@ -3,10 +3,10 @@
 
 /*---
 info: Promise.all([]) is resolved immediately
-es5id: 25.4.4.1_A2.2_T1
+es6id: 25.4.4.1_A2.2_T1
 author: Sam Mikes
 includes: [PromiseHelper.js]
-description: Promise.all([]) returns immediately 
+description: Promise.all([]) returns immediately
 ---*/
 
 var sequence = [];
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A2.3_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A2.3_T1.js
index 6f3b2242806b8b64568c593e4c878a8db1b98b1c..fe60c2a75ef673c371562b3f0a687fd65fbfd7d2 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A2.3_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A2.3_T1.js
@@ -3,7 +3,7 @@
 
 /*---
 info: Promise.all([]) returns a promise for a new empty array
-es5id: 25.4.4.1_A2.3_T1
+es6id: 25.4.4.1_A2.3_T1
 author: Sam Mikes
 description: Promise.all([]) returns a promise for an array
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A2.3_T2.js b/test/built-ins/Promise/all/S25.4.4.1_A2.3_T2.js
index 26706526d81a331a9622cb5cfcff251c0fe47384..fdfeb567c1623aff5ac5cf9d2608e0a0e60be0d2 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A2.3_T2.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A2.3_T2.js
@@ -3,7 +3,7 @@
 
 /*---
 info: Promise.all is resolved with a new empty array
-es5id: 25.4.4.1_A2.3_T2
+es6id: 25.4.4.1_A2.3_T2
 author: Sam Mikes
 description: Promise.all([]) returns a Promise for an empty array
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A2.3_T3.js b/test/built-ins/Promise/all/S25.4.4.1_A2.3_T3.js
index ab1caf6d85d55e04915f7b6bd917194dff006862..c936a4d755f75c1510d25c4e929ce33527c86be3 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A2.3_T3.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A2.3_T3.js
@@ -3,7 +3,7 @@
 
 /*---
 info: Promise.all([]) is resolved with Promise for a new empty array
-es5id: 25.4.4.1_A2.3_T3
+es6id: 25.4.4.1_A2.3_T3
 author: Sam Mikes
 description: Promise.all([]) is resolved with a Promise for a new array
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A3.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A3.1_T1.js
index 587c2a8de0f058ccd5934423e281a2c4e5a4e84e..52023add132cb384d8fd60b490fbe398efbe48ed 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A3.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A3.1_T1.js
@@ -3,10 +3,10 @@
 
 /*---
 info: >
-    Promise.all expects an iterable argument; 
+    Promise.all expects an iterable argument;
     ref 7.4.1 non-Object fails CheckIterable
     ref 7.4.2 GetIterator throws TypeError if CheckIterable fails
-es5id: 25.4.4.1_A3.1_T1
+es6id: 25.4.4.1_A3.1_T1
 author: Sam Mikes
 description: Promise.all(3) returns Promise rejected with TypeError
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A3.1_T2.js b/test/built-ins/Promise/all/S25.4.4.1_A3.1_T2.js
index ddab9ba4b903418e39952989746aa4d60414e50d..e046428242e449e312a2c2e48cfa5f8c3ebfb809 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A3.1_T2.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A3.1_T2.js
@@ -3,10 +3,11 @@
 
 /*---
 info: >
-    Promise.all expects an iterable argument; 
+    Promise.all expects an iterable argument;
     fails if recieves an abrupt completion
     ref 7.4.1 non-Object fails CheckIterable
     ref 7.4.2 GetIterator throws TypeError if CheckIterable fails
+es6id: S25.4.4.1_A3.1_T2
 author: Sam Mikes
 description: Promise.all(new Error()) returns Promise rejected with TypeError
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A3.1_T3.js b/test/built-ins/Promise/all/S25.4.4.1_A3.1_T3.js
index 9fad16f2e7ed6b28f5fc34a96cb5ba2dab7728af..b008294c3173e7973cdf7a0f09b70d6cd6777ef7 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A3.1_T3.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A3.1_T3.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    Promise.all expects an iterable argument; 
+    Promise.all expects an iterable argument;
     fails if GetIterator returns an abrupt completion.
+es6id: S25.4.4.1_A3.1_T3
 author: Sam Mikes
 description: Promise.all((throw on GetIterator)) returns Promise rejected with TypeError
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A4.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A4.1_T1.js
index d7a0f45e93021a23796a327fd004cca3b6baa4e1..35d10770b4a85703729f9ed604a63b453691f998 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A4.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A4.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.all should throw if 'this' does not conform to Promise constructor
+es6id: S25.4.4.1_A4.1_T1
 negative: TypeError
 description: this must conform to Promise constructor in Promise.all
 author: Sam Mikes
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A5.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A5.1_T1.js
index 4a32f6a0be6141dd086f659320b8ced38f279620..a46f0b6c17742abc0ad482c2e447cb85bab3f98b 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A5.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A5.1_T1.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    Promise.all expects an iterable argument; 
+    Promise.all expects an iterable argument;
     rejects if IteratorStep() throws
+es6id: S25.4.4.1_A5.1_T1
 author: Sam Mikes
 description: iterator.next throws, causing Promise.all to reject
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A6.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A6.1_T1.js
index 2b2b96c52ce5b4cb91181bdfdd713f9498a263df..9a1421cac67f0af8e1ce873ddcce287921ce19dc 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A6.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A6.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.all with 0-element array
+es6id: S25.4.4.1_A5.1_T1
 author: Sam Mikes
 description: Promise.all([]) produces a promise
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A6.1_T2.js b/test/built-ins/Promise/all/S25.4.4.1_A6.1_T2.js
index 373683e7699f403f0efc51266be52efa9909c0cd..ef9f9dbe9c8bd7bf19444e2678022a940b420b9b 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A6.1_T2.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A6.1_T2.js
@@ -5,6 +5,7 @@
 info: >
     Promise.all with 0-element array
     should accept an empty array
+es6id: S25.4.4.1_A6.1_T2
 author: Sam Mikes
 description: Promise.all([]) returns a promise for an empty array
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A7.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A7.1_T1.js
index ff1c937666a04bd2a45f2b4bd5426ad9faa0e404..cc1152b0e58b826cfa526b2767ef5d30615f2f5b 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A7.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A7.1_T1.js
@@ -5,6 +5,7 @@
 info: >
     Promise.all with 1-element array
     should accept an array with settled promise
+es6id: S25.4.4.1_A6.1_T2
 author: Sam Mikes
 description: Promise.all([p1]) is resolved with a promise for a one-element array
 ---*/
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A7.2_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A7.2_T1.js
index 7c3940ec5cd216ee0c95e0b4b62693b517fe07f6..10fd4989555675d4458a20298c6ef8b66c27bcfc 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A7.2_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A7.2_T1.js
@@ -5,6 +5,7 @@
 info: >
     Promise.all with 1-element array
     should accept an array with settled promise
+es6id: S25.4.4.1_A7.2_T1
 author: Sam Mikes
 description: Promise.all() accepts a one-element array
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A8.1_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A8.1_T1.js
index c0cf75318f9f1a7d1d6ff12417a868a9b52bf9e5..7e3df638ec46848d2ab0914b18b81b8a6b5b0096 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A8.1_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A8.1_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.1_A8.1_T1
 author: Sam Mikes
 description: Promise.all([p1, p2]) resolution functions are called in predictable sequence
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A8.2_T1.js b/test/built-ins/Promise/all/S25.4.4.1_A8.2_T1.js
index 1fedf5ffac8a01a7307667d2ce51b0ac14e1925c..2bc4ba3635872c9013a85677161c70b148cb614d 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A8.2_T1.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A8.2_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.all with 2-element array
+es6id: S25.4.4.1_A8.1_T1
 author: Sam Mikes
 description: Promise.all() rejects when a promise in its array rejects
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/all/S25.4.4.1_A8.2_T2.js b/test/built-ins/Promise/all/S25.4.4.1_A8.2_T2.js
index 5bf25f5d91a91720f411f37229658c552ea00984..fdd2d449ae9d7ea8d52f231152d8b113b16ccbfa 100644
--- a/test/built-ins/Promise/all/S25.4.4.1_A8.2_T2.js
+++ b/test/built-ins/Promise/all/S25.4.4.1_A8.2_T2.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.all with 2-element array
+es6id: S25.4.4.1_A8.2_T2
 author: Sam Mikes
 description: Promise.all() rejects when second promise in array rejects
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/S25.4.4.2_A1.1_T1.js b/test/built-ins/Promise/prototype/S25.4.4.2_A1.1_T1.js
index dc61a6931e3adc178a04c5cedf65dd389b8b099a..4b9cbac28fd0216e3343e03e73278dc9be07dca1 100644
--- a/test/built-ins/Promise/prototype/S25.4.4.2_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/S25.4.4.2_A1.1_T1.js
@@ -5,6 +5,7 @@
 info: >
     Promise prototype object exists, is object, not enumerable, writable,
     or configurable
+es6id: S25.4.4.2_A1.1_T1
 author: Sam Mikes
 description: Promise prototype exists
 ---*/
diff --git a/test/built-ins/Promise/prototype/S25.4.5_A1.1_T1.js b/test/built-ins/Promise/prototype/S25.4.5_A1.1_T1.js
index ec20bf602eaeb27f3bc87f63d9d21d23ba4946f8..3cb592216ccdd4c016be2523de1762d57a02466d 100644
--- a/test/built-ins/Promise/prototype/S25.4.5_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/S25.4.5_A1.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise prototype object is an ordinary object
+es6id: S25.4.5_A1.1_T1
 author: Sam Mikes
 description: Promise prototype does not have [[PromiseState]] internal slot
 negative: TypeError
diff --git a/test/built-ins/Promise/prototype/S25.4.5_A2.1_T1.js b/test/built-ins/Promise/prototype/S25.4.5_A2.1_T1.js
index 2ff5e9ae0839554e3d873d13f848ca9dacc94fb6..b9347c924df89684a035f79688d9fc4637dcc389 100644
--- a/test/built-ins/Promise/prototype/S25.4.5_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/S25.4.5_A2.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise prototype object is an ordinary object
+es6id: S25.4.5_A2.1_T1
 author: Sam Mikes
 description: Promise prototype is a standard built-in Object
 ---*/
diff --git a/test/built-ins/Promise/prototype/S25.4.5_A3.1_T1.js b/test/built-ins/Promise/prototype/S25.4.5_A3.1_T1.js
index b4fa5cea410a783b1f8942bd42f83243591f306a..e8be4075fbec8ff1467dd3a80ba8cff6283117ea 100644
--- a/test/built-ins/Promise/prototype/S25.4.5_A3.1_T1.js
+++ b/test/built-ins/Promise/prototype/S25.4.5_A3.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.prototype.constructor is the Promise constructor
+es6id: S25.4.5_A3.1_T1
 author: Sam Mikes
 description: Promise.prototype.constructor is the Promise constructor
 ---*/
diff --git a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A1.1_T1.js b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A1.1_T1.js
index 064e964b7adcbe7c29e084f962264f3212e6c5e9..2c71a1810d7abee6d9b40a26af313b7be7734f6d 100644
--- a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A1.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise prototype.catch is a function
+es6id: S25.4.5.1_A1.1_T1
 author: Sam Mikes
 description: Promise.prototype.catch is a function
 ---*/
diff --git a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A2.1_T1.js b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A2.1_T1.js
index 99a45f501093ea91d79e1f68cd391ff87273428a..fe2a7446b1ccc3c9cf33888a21b8dd7e1b0f6b43 100644
--- a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A2.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     catch is a method on a Promise
+es6id: S25.4.5.1_A2.1_T1
 author: Sam Mikes
 description: catch is a method on a Promise
 ---*/
diff --git a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T1.js b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T1.js
index 2dd242ed0d8b1fd453b6a24c7a327aa68045a728..036905899ff4345998c6a24c3e03a188e3fbc199 100644
--- a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T1.js
+++ b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     catch(arg) is equivalent to then(undefined, arg)
+es6id: S25.4.5.1_A3.1_T1
 author: Sam Mikes
 description: catch is implemented in terms of then
 ---*/
diff --git a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T2.js b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T2.js
index 143d2e8045c86036f55360fa83ccc0706e78962b..a1624e162085033196cbdce7c103acc4686a5376 100644
--- a/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T2.js
+++ b/test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T2.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     catch(arg) is equivalent to then(undefined, arg)
+es6id: S25.4.5.1_A3.1_T2
 author: Sam Mikes
 description: catch is implemented in terms of then
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A1.1_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A1.1_T1.js
index 7bcd06d73283d296d50aa99ddd31cc8c2b4571df..0afc99700d449104f3484ba4ca8bb252e1f72dc7 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A1.1_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Promise.race is callable
+es6id: S25.4.4.3_A1.1_T1
 author: Sam Mikes
 description: Promise.race is callable
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.1_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.1_T1.js
index 7f54054e1df9ff53125194e440bad2eae2b7313a..a3b3fd963a9e2a006ad9d6c140d8c80341b4a194 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.1_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Promise.race returns a new promise
+es6id: S25.4.4.3_A2.1_T1
 author: Sam Mikes
 description: Promise.race returns a new promise
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T1.js
index b8a4554f6d7733e3c4b6310171c5db77bfdd75c2..70e2f001be7ab7db8ad62c5af4e08a8a7ff6815d 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Promise.race rejects on non-iterable argument
+es6id: S25.4.4.3_A2.2_T1
 author: Sam Mikes
 description: Promise.race rejects if argument is not object or is non-iterable
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T2.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T2.js
index 29200c90afb58f0ec3b9491ffa65981755aeac40..e4188ee458a6bec6285e6c9f257175719c07afdd 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T2.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Promise.race rejects on non-iterable argument
+es6id: S25.4.4.3_A2.2_T2
 author: Sam Mikes
 description: Promise.race rejects if argument is not object or is non-iterable
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T3.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T3.js
index 4173503010a10a0ba8113681a60f9c609ca91760..5f94795e5858aa95eb142468c822ee0d3bc058a0 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T3.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A2.2_T3.js
@@ -2,11 +2,11 @@
 // See LICENSE for details.
 
 /*---
-info: > 
+info: >
     Promise.race rejects when GetIterator() returns an abrupt completion
     4. Let iterator be GetIterator(iterable).
     5. IfAbruptRejectPromise(iterator, promiseCapability)
-
+es6id: S25.4.4.3_A2.2_T3
 author: Sam Mikes
 description: Promise.race rejects if GetIterator throws
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T1.js
index 824712c0419ac143550b9c72a76366c876b756cb..0c62768bc85f81bbda697fb8c1b9b9a76e846677 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T1.js
@@ -6,6 +6,7 @@ info: >
     Promise.race throws on invalid 'this'
     Note: must have at least one element in array, or else Promise.race
     never exercises the code that throws
+es6id: S25.4.4.3_A3.1_T1
 author: Sam Mikes
 description: Promise.race throws if 'this' does not conform to Promise constructor
 negative: TypeError
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T2.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T2.js
index 687463f057b5cd439aaeffd49a28e8a80aabf6c5..a889a4571078df68457ead08c40e55a0c370db65 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T2.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A3.1_T2.js
@@ -6,6 +6,7 @@ info: >
     Promise.race must throw TypeError per
     CreatePromiseCapabilityRecord step 8 when
     promiseCapabliity.[[Resolve]] is not callable
+es6id: S25.4.4.3_A3.1_T2
 author: Sam Mikes
 description: Promise.race throws TypeError, even on empty array, when 'this' does not conform to Promise constructor
 negative: TypeError
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T1.js
index b1d979c7a46b18682bf3736c877f234702ea1b05..33f499ac1c72d856b3500977d0ca555dc21b597a 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A4.1_T1
 author: Sam Mikes
 description: Promise.race rejects if IteratorStep throws
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T2.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T2.js
index bd7f880f4a7b684e84487750d9e70b411866437a..17fc8870178ea01a1c6d431565ada23e2b17ee6d 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T2.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A4.1_T2.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A4.1_T2
 author: Sam Mikes
 description: Promise.race rejects if IteratorStep throws
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A5.1_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A5.1_T1.js
index 8bcd93aa51b4f17102f0bee41dc6151924210620..cc9042d2a7d24d2f3b561d8880c0b1c55c91f076 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A5.1_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A5.1_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A5.1_T1
 author: Sam Mikes
 description: Promise.race([]) never settles
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.1_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.1_T1.js
index d652669a0f85efa4d2ea26feaed72c4e65778714..e3a8cb6088469c49a42f94896c63f48ddd387b6d 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.1_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.1_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A6.1_T1
 author: Sam Mikes
 description: Promise.race([1]) settles immediately
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.2_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.2_T1.js
index be5745565f00a3921083aa12c357325522f3dfb7..35b71d966b4a0e53bcd23dd5452370f0a84cd933 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.2_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A6.2_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A6.2_T1
 author: Sam Mikes
 description: Promise.race([p1]) settles immediately
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T1.js
index 4109073344319712130f74d7d3b73e0d48c4b6f9..8e5636a79fe2ec7c9bc11ee7ced85ff944b410ca 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A7.1_T1
 author: Sam Mikes
 description: Promise.race([p1, p2]) settles when first settles
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T2.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T2.js
index 746c71cddc949642dfbe24d77b3a7b9d53b3104c..a07716d6b19d2ebe4a320894f4ae19b791b5b8e9 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T2.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T2.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A7.1_T2
 author: Sam Mikes
 description: Promise.race([p1, p2]) settles when first settles
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T3.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T3.js
index 76e4be891821632a3584989be626393931efdcf1..941d794743e30634d89437c61edcfc30e16ac916 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T3.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.1_T3.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A7.1_T3
 author: Sam Mikes
 description: Promise.race([p1, p2]) settles when first settles
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.2_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.2_T1.js
index e3afc0f6d489a9bbb2264fa1ba652932e2898cd6..6dbf6fc956d78a8a5291ef63c592524ee0bed895 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.2_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.2_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A7.2_T1
 author: Sam Mikes
 description: Promise.race([p1, p2]) settles when first settles
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T1.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T1.js
index 312e25cc15bf0cafac2638ffbadfcae9c05e8da2..aedf18bfec4c92fc5798c8b71b8db863441de562 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T1.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A7.3_T1
 author: Sam Mikes
 description: Promise.race([p1, p2]) settles when first settles
 ---*/
diff --git a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T2.js b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T2.js
index 08d5b28097d25f447321cd4908fca6ee451eb775..8609e5dd798db3c8336de1695787ed509b19d806 100644
--- a/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T2.js
+++ b/test/built-ins/Promise/prototype/race/S25.4.4.3_A7.3_T2.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.3_A7.3_T2
 author: Sam Mikes
 description: Promise.race([p1, p2]) settles when first settles
 ---*/
diff --git a/test/built-ins/Promise/prototype/reject/S25.4.4.4_A1.1_T1.js b/test/built-ins/Promise/prototype/reject/S25.4.4.4_A1.1_T1.js
index c906c2cde2b05241698e287fd45d11772ea57195..639cd9fd0d152734ba2a4cd4d27181764e4fc57a 100644
--- a/test/built-ins/Promise/prototype/reject/S25.4.4.4_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/reject/S25.4.4.4_A1.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
    Promise.reject
+es6id: S25.4.4.4_A1.1_T1
 author: Sam Mikes
 description: Promise.reject is a function
 ---*/
diff --git a/test/built-ins/Promise/prototype/reject/S25.4.4.4_A2.1_T1.js b/test/built-ins/Promise/prototype/reject/S25.4.4.4_A2.1_T1.js
index ba284de166f881732feabc4cbbcfd9ce2447e234..1c721b3d722400546b2e43ab79b553de3ceda1f5 100644
--- a/test/built-ins/Promise/prototype/reject/S25.4.4.4_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/reject/S25.4.4.4_A2.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
    Promise.reject
+es6id: S25.4.4.4_A2.1_T1
 author: Sam Mikes
 description: Promise.reject creates a new settled promise
 ---*/
diff --git a/test/built-ins/Promise/prototype/reject/S25.4.4.4_A3.1_T1.js b/test/built-ins/Promise/prototype/reject/S25.4.4.4_A3.1_T1.js
index ba6c68b5ab79291e6e88ce549d5c283ccda17469..443d5c1b297fba83958cbf8b1ca190757091ca7e 100644
--- a/test/built-ins/Promise/prototype/reject/S25.4.4.4_A3.1_T1.js
+++ b/test/built-ins/Promise/prototype/reject/S25.4.4.4_A3.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
    Promise.reject
+es6id: S25.4.4.4_A3.1_T1
 author: Sam Mikes
 description: Promise.reject throws TypeError for bad 'this'
 negative: TypeError
diff --git a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A1.1_T1.js b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A1.1_T1.js
index 84323394871996caa56e7f63ba6b186136332a48..6c92a08f242f7d1826f14454b438b7cbf0fc0eda 100644
--- a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A1.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
    Promise.resolve
+es6id: S25.4.4.5_A1.1_T1
 author: Sam Mikes
 description: Promise.resolve is a function
 ---*/
diff --git a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.1_T1.js b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.1_T1.js
index c3bce23cb185d00807d010721a19165067f176a2..15718a0a61f8c02129403927806ba234ee596fed 100644
--- a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.1_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.5_A2.1_T1
 author: Sam Mikes
 description: Promise.resolve passes through a promise w/ same Constructor
 ---*/
diff --git a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.2_T1.js b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.2_T1.js
index aa5c3a10f1962f41b9650fcec474f07f1d252d16..1ab3f41cd1fa5b5fa0ddbb9492bdde65c466b31f 100644
--- a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.2_T1.js
+++ b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.2_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.5_A2.2_T1
 author: Sam Mikes
 description: Promise.resolve passes through an unsettled promise w/ same Constructor
 ---*/
diff --git a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.3_T1.js b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.3_T1.js
index f7c9ade18f5014abbdc5d89d15b8220a8d38c28d..a54c21ede0d53924af24426aa7c0daaa86d82f83 100644
--- a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.3_T1.js
+++ b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A2.3_T1.js
@@ -2,6 +2,7 @@
 // See LICENSE for details.
 
 /*---
+es6id: S25.4.4.5_A2.3_T1
 author: Sam Mikes
 description: Promise.resolve passes through an unsettled promise w/ same Constructor
 ---*/
diff --git a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A3.1_T1.js b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A3.1_T1.js
index 7a998b1e9d9825fd674c08251ace8f138bf8720e..7c57636f195a81c882a1b3d5819a2652b54c1a34 100644
--- a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A3.1_T1.js
+++ b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A3.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
    Promise.resolve
+es6id: S25.4.4.5_A3.1_T1
 author: Sam Mikes
 description: Promise.resolve delegates to foreign thenable
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A4.1_T1.js b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A4.1_T1.js
index e552c3c1acb55cb3c751ac99439840381f1339d7..aa11bf012508140676c6a7d22f3d36eb01851c58 100644
--- a/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A4.1_T1.js
+++ b/test/built-ins/Promise/prototype/resolve/S25.4.4.5_A4.1_T1.js
@@ -3,7 +3,8 @@
 
 /*---
 info: >
-    Section 25.4.1.4.2 
+    Section 25.4.1.4.2
+es6id: S25.4.4.5_A3.1_T1
 author: Sam Mikes
 description: self-resolved Promise throws TypeError
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.2.1_A1.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.2.1_A1.1_T1.js
index 064dac8c9e34817b84653d60962df4983e00146c..d5bf88f39c8444e753089a7b682109d10d766ce1 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.2.1_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.2.1_A1.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise reaction jobs have predictable environment
+es6id: S25.4.2.1_A1.1_T1
 author: Sam Mikes
 description: argument passes through "Identity"
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.2.1_A2.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.2.1_A2.1_T1.js
index f0936297757478d35aba7ff93c367f8fa06d984a..4c6eb976391bfdf9547b130682358c168782ac05 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.2.1_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.2.1_A2.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise reaction jobs have predictable environment
+es6id: S25.4.2.1_A2.1_T1
 author: Sam Mikes
 description: argument thrown through "Thrower"
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T1.js
index 18bb36f6f75b92f6a5eafe9e2daadb5225e55ec0..2d3d8ee3ee229b73bdb41d9e44a9524946f9ea0b 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise reaction jobs have predictable environment
+es6id: S25.4.2.1_A3.1_T1
 author: Sam Mikes
 description: Promise.onFulfilled gets undefined as 'this'
 flags: [noStrict]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T2.js b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T2.js
index 7d5816f6fbe3abf6c6025d4b60d289c8939f98ce..a843cf5a55a9f15e1423a7e6a57be9f39a08216f 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T2.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.1_T2.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise reaction jobs have predictable environment
+es6id: S25.4.2.1_A3.1_T2
 author: Sam Mikes
 description: Promise.onFulfilled gets undefined as 'this'
 flags: [onlyStrict]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T1.js b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T1.js
index 9c2346bf8de34a6626dd218a6e2bd75bcfbf3666..dccad16d4dda4db622d97273b8a5c9ac70de2729 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T1.js
@@ -6,6 +6,7 @@ info: >
     Promise reaction jobs have predictable environment
     'this' is global object in sloppy mode,
     undefined in strict mode
+es6id: S25.4.2.1_A3.2_T1
 author: Sam Mikes
 description: onRejected gets default 'this'
 flags: [noStrict]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T2.js b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T2.js
index 09bab4763ca9fc920a940536d3ebe48ac5d02998..7ef2666b78b40a0474acd070cc13861a18499ea2 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T2.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.2.1_A3.2_T2.js
@@ -6,6 +6,7 @@ info: >
     Promise reaction jobs have predictable environment
     'this' is global object in sloppy mode,
     undefined in strict mode
+es6id: S25.4.2.1_A3.2_T2
 author: Sam Mikes
 description: onRejected gets default 'this'
 flags: [onlyStrict]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.4_A1.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.4_A1.1_T1.js
index 4497e2b2e8971c40156ebc32bcfa2bcdf3147a16..f248d345cc14756f186b2adcbee9847a186db627 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.4_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.4_A1.1_T1.js
@@ -4,7 +4,8 @@
 /*---
 info: >
    Misc sequencing tests
-   inspired by https://github.com/getify/native-promise-only/issues/34#issuecomment-54282002    
+   inspired by https://github.com/getify/native-promise-only/issues/34#issuecomment-54282002
+es6id: S25.4.2.1_A3.2_T2
 author: Sam Mikes
 description: Promise onResolved functions are called in predictable sequence
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T1.js
index 47086b9461447d37c3e02c72294f588fdcab92b6..1daafe5527ed8320f7ed5de7bc54a01e505cc61d 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T1.js
@@ -6,6 +6,7 @@ info: >
    Misc sequencing tests
    inspired by https://github.com/promises-aplus/promises-tests/issues/61
    Case "T1"
+es6id: S25.4.4_A2.1_T1
 author: Sam Mikes
 description: Promise onResolved functions are called in predictable sequence
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T2.js b/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T2.js
index 991feaad7d401fd706c30c1d412a7f394160309f..8bebe81877acdd2e7c8195750f897ca6c03d54fa 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T2.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T2.js
@@ -6,6 +6,7 @@ info: >
    Misc sequencing tests
    inspired by https://github.com/promises-aplus/promises-tests/issues/61
    Case "T2a"
+es6id: S25.4.4_A2.1_T2
 author: Sam Mikes
 description: Promise onResolved functions are called in predictable sequence
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T3.js b/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T3.js
index b050f14da17ea5d5d8334f5e9c4218f5d7804e57..2476658a1f61ea2a6b739c6aeb265f4a63e072b7 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T3.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T3.js
@@ -6,6 +6,7 @@ info: >
    Misc sequencing tests
    inspired by https://github.com/promises-aplus/promises-tests/issues/61
    Case "T2b"
+es6id: S25.4.4_A2.1_T3
 author: Sam Mikes
 description: Promise onResolved functions are called in predictable sequence
 includes: [PromiseHelper.js]
@@ -28,7 +29,7 @@ Promise.resolve().then(function () {
     p1.then(function (msg) {
         sequence.push(msg);
     });
-    
+
     p2.catch(function (msg) {
         sequence.push(msg);
     }).then(function () {
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T1.js
index e8c5d3e5d95a916a74c61e6ce802643603e725dd..10ac0554d91537fe3e29cf63dca62927972137d3 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.prototype.then is a function of two arguments
+es6id: S25.4.5.3_A1.1_T1
 author: Sam Mikes
 description: Promise.prototype.then is a function of two arguments
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T2.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T2.js
index 1369eefbe97ee49e506f2c8c0aaa74ed7e6f571c..1fdcfe606f9ada34e672c7b788ffdcbc5c31d1b4 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T2.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A1.1_T2.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.prototype.then is a function of two arguments
+es6id: S25.4.5.3_A1.1_T2
 author: Sam Mikes
 description: Promise.prototype.then is a function of two arguments
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T1.js
index a56fbd6111caccc042448848eafbd1762ab473d4..5bb18fe796c1ed28be162747a8a863e4f9a0888b 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T1.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.prototype.then expects a constructor conforming to Promise as 'this'
+es6id: S25.4.5.3_A2.1_T1
 author: Sam Mikes
 description: Promise.prototype.then throw if 'this' is non-Object
 negative: TypeError
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T2.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T2.js
index d549abaa3ae1bce5d62bced29a2b3dc4a0d713fa..085f9a8cff1981c59f29667bdaeafbcdd15d2f9a 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T2.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A2.1_T2.js
@@ -4,6 +4,7 @@
 /*---
 info: >
     Promise.prototype.then expects a Promise as 'this'
+es6id: S25.4.5.3_A2.1_T2
 author: Sam Mikes
 description: Promise.prototype.then throw if 'this' is non-Promise Object
 negative: TypeError
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A3.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A3.1_T1.js
index db6e17dc5f74b4cb342fea229b29265028eacb1b..9c9eedd16262d96e11cab4f20ac24cb08677dab5 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A3.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A3.1_T1.js
@@ -5,6 +5,7 @@
 info: >
     Promise.prototype.then throws TypeError if Get(promise, "constructor") throws
     Ref 25.4.5.3 step 4 ReturnIfAbrupt(C)
+es6id: S25.4.5.3_A3.1_T1
 author: Sam Mikes
 description: Promise.prototype.then throws if Get(promise, "constructor") throws
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T1.js
index 8f5fec3a20269037b29c25b5299ea55f8387a9fa..960604db5be359979774779a63df0de08e0cdefe 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T1.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    PerformPromiseThen 
+    PerformPromiseThen
     Ref 25.4.5.3.1
+es6id: S25.4.5.3_A4.1_T1
 author: Sam Mikes
 description: Promise.prototype.then accepts 'undefined' as arg1, arg2
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T2.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T2.js
index e34b6f01ca53a7b765b4bc3e81ef1967ec991bd1..3c817f4f8ca6af6057c8fc1ee970e7e240ace048 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T2.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T2.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    PerformPromiseThen 
+    PerformPromiseThen
     Ref 25.4.5.3.1
+es6id: S25.4.5.3_A4.1_T2
 author: Sam Mikes
 description: Promise.prototype.then accepts 'undefined' as arg1, arg2
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T1.js
index c82e0281d6b1dd1d32aa3eaa284c062a0e1177da..978e1b52abf9a48aaeaa6fc8c2b64194675b5a0f 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T1.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    PerformPromiseThen 
+    PerformPromiseThen
     Ref 25.4.5.3.1
+es6id: S25.4.5.3_A4.2_T1
 author: Sam Mikes
 description: Promise.prototype.then treats non-callable arg1, arg2 as undefined
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T2.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T2.js
index 08e1500ae4ae91b2883ca8582df41a6878f48359..41bec78e6bbbef37a1c02f30dacb7104897ef69b 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T2.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A4.2_T2.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    PerformPromiseThen 
+    PerformPromiseThen
     Ref 25.4.5.3.1
+es6id: S25.4.5.3_A4.2_T2
 author: Sam Mikes
 description: Promise.prototype.then treats non-callable arg1, arg2 as undefined
 ---*/
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.1_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.1_T1.js
index 69819e355b291c19d6299df41f52e7d2bdf8e11a..c10f5340375a0289d5f98996d52f0a6e5f265e6b 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.1_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.1_T1.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    PerformPromiseThen 
+    PerformPromiseThen
     Ref 25.4.5.3.1
+es6id: S25.4.5.3_A5.1_T1
 author: Sam Mikes
 description: Promise.prototype.then enqueues handler if pending
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.2_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.2_T1.js
index 444df5babdafe632f32a3431e6316ad606143d7c..46c05ad91786cc4b57511f29c892ff92c71e9a83 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.2_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.2_T1.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    PerformPromiseThen 
+    PerformPromiseThen
     Ref 25.4.5.3.1
+es6id: S25.4.5.3_A5.2_T1
 author: Sam Mikes
 description: Promise.prototype.then immediately queues handler if fulfilled
 includes: [PromiseHelper.js]
diff --git a/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.3_T1.js b/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.3_T1.js
index 7c9f67cc33f989d741f7545dce746ecd5a1f8069..d41180713f766ca3b0a0fdf215f688e8a499b3de 100644
--- a/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.3_T1.js
+++ b/test/built-ins/Promise/prototype/then/S25.4.5.3_A5.3_T1.js
@@ -3,8 +3,9 @@
 
 /*---
 info: >
-    PerformPromiseThen 
+    PerformPromiseThen
     Ref 25.4.5.3.1
+es6id: S25.4.5.3_A5.3_T1
 author: Sam Mikes
 description: Promise.prototype.then immediately queues handler if rejected
 includes: [PromiseHelper.js]
diff --git a/test/language/expressions/assignment/S11.13.1_A5_T1.js b/test/language/expressions/assignment/S11.13.1_A5_T1.js
index 9f32fe4e1f1a4e96e59c672ada6cf30377a863b0..28c40c15b13ed75b6cfbd3c2edd4a25e971f378a 100755
--- a/test/language/expressions/assignment/S11.13.1_A5_T1.js
+++ b/test/language/expressions/assignment/S11.13.1_A5_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A5_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/assignment/S11.13.1_A5_T2.js b/test/language/expressions/assignment/S11.13.1_A5_T2.js
index 4850d96810568136f59f46ba0b027b9643f12657..97172ae2a1591c39c46ebc6727a4fa24f53bd9d3 100755
--- a/test/language/expressions/assignment/S11.13.1_A5_T2.js
+++ b/test/language/expressions/assignment/S11.13.1_A5_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A5_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/assignment/S11.13.1_A5_T3.js b/test/language/expressions/assignment/S11.13.1_A5_T3.js
index 874579c684aa16636cfb1702ca20a71a7dcfba41..e3e7c58dfca74673c5360cf50ca57b2c54a39144 100755
--- a/test/language/expressions/assignment/S11.13.1_A5_T3.js
+++ b/test/language/expressions/assignment/S11.13.1_A5_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A5_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/assignment/S11.13.1_A5_T4.js b/test/language/expressions/assignment/S11.13.1_A5_T4.js
index 74924f150f493fae0ae529c027ccd17ec7b4f52c..e02c07f2977b5c1473282953408ec941dbbdb4b0 100755
--- a/test/language/expressions/assignment/S11.13.1_A5_T4.js
+++ b/test/language/expressions/assignment/S11.13.1_A5_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A5_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/assignment/S11.13.1_A5_T5.js b/test/language/expressions/assignment/S11.13.1_A5_T5.js
index b6a339361493501dbe2af39ab3025529c876da42..6e9294167797842fb909d97f77e2d9d464389d1d 100755
--- a/test/language/expressions/assignment/S11.13.1_A5_T5.js
+++ b/test/language/expressions/assignment/S11.13.1_A5_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A5_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/assignment/S11.13.1_A6_T1.js b/test/language/expressions/assignment/S11.13.1_A6_T1.js
index e1fc3f73131be273fe2213fa6453a483005b8c6c..08998720908a492d6a66666bfafb1aa977ff8e01 100755
--- a/test/language/expressions/assignment/S11.13.1_A6_T1.js
+++ b/test/language/expressions/assignment/S11.13.1_A6_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A6_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/assignment/S11.13.1_A6_T2.js b/test/language/expressions/assignment/S11.13.1_A6_T2.js
index 2c244ac6ea89471f61bb0b68bcf8a1de8b6df807..2940f71065fdebdefc01ac06cf2a467062946a1e 100755
--- a/test/language/expressions/assignment/S11.13.1_A6_T2.js
+++ b/test/language/expressions/assignment/S11.13.1_A6_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A6_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/assignment/S11.13.1_A6_T3.js b/test/language/expressions/assignment/S11.13.1_A6_T3.js
index 3717918a48e2145de48479768c58ec70539fca05..aaac0e4b134c99452f3e15f8ffb86099b2f0bedc 100755
--- a/test/language/expressions/assignment/S11.13.1_A6_T3.js
+++ b/test/language/expressions/assignment/S11.13.1_A6_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Assignment Operator calls PutValue(lref, rval)
+es5id: S11.13.1_A6_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T1.js
index cafb27cf36aaa74af79c26757d1840cb65ac8e8e..d7c0c907db563e685f910c6f3d13074042972b04 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.10_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T2.js
index 2822744526997ffbf11acc62b7727b8753704918..dbcf2af79286bd906688ce8a3c40bc4c97c1589f 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.10_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T3.js
index 7c9393436258f0ac97a404abb682c2e5c84a544c..57000739f1ee15d27d72c77569c6c97280f946fc 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.10_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T4.js
index 7860a32a19b6f99b050ef02c21127bf1b3f25140..e99bac8abed06a18704375b30c9fd7ac85c68554 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.10_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T5.js
index 2e44feabc049939d6550c9548824082796b65bcb..09e1e82687c1f0ef072ae824e4283a38b99dcff1 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.10_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.10_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.10_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T1.js
index 84bdc34fd47632807db2e407332badc33c7b7264..5992f3416da01b4fc37e4547f207cbf8efcb636b 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.11_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T2.js
index 2d9af20b7c3eb92d49e9532bbdfaf9acab3e969d..4417008f8149aa8e293b592901d3c6bc06b5f546 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.11_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T3.js
index 82a1831c2fb6ddb52e6e3cab58ae30cae73befe8..09b5754ffff5ba600d66f39ef197c013f7d22fd9 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.11_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T4.js
index 25edd063f71abdffb8b9167994ef9e814b2c1e65..8c8412f81455f0454906d96d46e96c3d51e1835e 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.11_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T5.js
index 37ff88d6952dedf2e27a360c186a84db3cb55c33..50123ae5f52f2ecbc7255c911659f29f7fd5a02b 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.11_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.11_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.11_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T1.js
index b84848127ca8558d379befff0e119817ba151558..2b2be7ca4c3d2d598749786aba754e1cc439e742 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.1_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T2.js
index dc36113412289f292937d341062fd797a25ac3d2..49042053dd85d64972419363798f2050deb96679 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.1_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T3.js
index 38281089464f7204f71e47a64f7458fb2b800a85..9004294d25fcd48c1d0c12dfd67174b4b36238bf 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.1_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T4.js
index 6271b1f05d459e8736e79826d2a428b279188906..96d309fc19f08efcf9352780b542aa9cbf110239 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.1_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T5.js
index 1e78dd1a35d3d1123681e59ced82b4dbe0f5dcb6..e9d23ac6d1dc1eaedbda3c25fa11a745174aa753 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.1_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.1_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.1_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T1.js
index b0601e9a580c8c5c36001011b9858e9b6e2bb6a5..2191a136105a7bdefa0d7a39c8a1fa084a2a2b99 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.2_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T2.js
index 452f06fcb1fdb48bc881313c32703831c95cdb63..eaeaee01589120f981543ae3fd3d2355af3a6850 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.2_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T3.js
index d31665890d14a73ce5e178bd70051340ec57569b..89e52964abd193fc00804db22bf1235415117edf 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.2_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T4.js
index e860d2a4563821833485413372a9f825ad2be547..c198639414baa03bbffac7555e905ddfbae9bc1d 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.2_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T5.js
index 8b255af103829a4e2b05c5067a43c90c0b905bde..eeb64bcb367651c35311b4ca1fe248e6fe8d91a6 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.2_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.2_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.2_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T1.js
index 176689d6874f035998db54f0099e44df527eba53..d87c00b381db826033f1f73946e7f2a08e670b1a 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.3_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T2.js
index f969c365d5353255d843a7f6084b7c47e6e4369d..1b263db2a4b42f5c9b23bfbe28120728a410f830 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.3_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T3.js
index 153c8d5e4e2602bf2db5dde598e2f9f559b9b611..f985f1cb0557b4fbe86b9fc4c780311ed09ac6ba 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.3_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T4.js
index f2f918bd19924efd8b73db8a2d1252349d02bd5b..751327871712c7b485156e2685fe6a2cece102b7 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.3_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T5.js
index f7b844e8bb24919ba178b9b7f8c40c50f4bdfc3e..4dcd42f9a78035ab860f149b8ed2ab5f063a2f8e 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.3_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.3_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.3_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T1.js
index 844c3b07ca472a89565db9222523b94dd3570cef..0288debb3cb7cc3f65ec93fdbffc25b94b799420 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.4_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T2.js
index 255288bd2d1cf65ed54cc7a815735d56b38c3d94..5d1f92e15c0c77fc3070df1a45fb766c2dba1385 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.4_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T3.js
index 54755f96d41eb7b13a039396fdbca10b928b0731..2c442ac0c19f3fb0873f3ef2402a24aa3408076f 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.4_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T4.js
index 22165d90556e2ead78c7273dcf00198dc20bfa0a..df24808bc7c8539037cfd50c7a243b9c68a5fbe6 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.4_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T5.js
index 3002cc9ebf7ad58fe99b55687d083fb32f0be2a5..93850136305eef0603ce1ea6cd77423a44f373ae 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.4_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.4_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.4_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T1.js
index 93c7b9314d1393619044d27e1f5293a9a66ecbf4..89f971087f347fc425ab622ff7f0502f5a09b937 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.5_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T2.js
index dbdccdb3038dc945d3d471dc07ef63ce8251035e..34a291725850d528f4a9c57b6748a92b19f5153a 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.5_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T3.js
index de7874b0875fb6350a239713ead20a20ebf382f6..f2a0c6c5f243b626075a7d39b121ed1288e5be16 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.5_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T4.js
index 295e6e2a8dcca89eacedb7ef3ad643b065808850..7da5d5470d3b9afa6099bb397ba56f56759ddeeb 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.5_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T5.js
index 993cb3ea2e71c887bd7c29c59b898c99c802aca3..fd2ef123d565b3186d36a8ecf5028292902c98ea 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.5_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.5_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.5_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T1.js
index 71aeb004f04ed91a836be218a2b2c12cc298048c..ee5346da427334415a1578fb4fdd36402dd9c8c3 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.6_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T2.js
index fe3b3276e635685bd0e947b7bdf87fee5e4aceed..3328bb6bc1cd0acea7beb928cb3baba174d01a09 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.6_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T3.js
index 0e7f0d5498a156ea56eeb2fdf12f241c656196fa..b553179d2bc1e49f4e98ab101600e9b840604e80 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.6_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T4.js
index f09709a3b21d7ebbdfeac76cd9491041d4cf947a..b766a7dcb6c477b48aa58a8112c373eb278d2188 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.6_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T5.js
index 4097e36d53a0352acaf588900db2d8653d8d5aec..16abab4194fba32ef284ff409827944e7b43eb7d 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.6_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.6_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.6_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T1.js
index 08be817e5d9b47ea1c954a2c7d5e01e7e7c3ef04..09042d1098f91fe1229f35b7cf215140ec1fc31d 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.7_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T2.js
index 4cdb34e4756125773ba1bd64e4ebda20276ec625..9d0668cc875abec2e9356d239d2bf2429af13a46 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.7_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T3.js
index ae5880b76ad719e3bb6eeeda34280daa1af17ecb..f90e8c1b0e486c783b89427d6deb45015ee8b146 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.7_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T4.js
index 3a77770860d19b09fcd1bdb8faed643b038b9d42..484b412d10baeec818bcf925d6fed341454e29c9 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.7_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T5.js
index 400adb454321e0fe4784c8fd04d2a52fd957b6c4..3a361b0f21f20c188da255481e557d53969b107a 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.7_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.7_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.7_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T1.js
index 5f2f35bb0b00647e08dabd8c865cc9bedf2b66cb..1014511c58ee3cdbe3d7ef79030652da6fe4cb8f 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.8_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T2.js
index bcc8cfec5f43edea8c6c40f8e932b0095ed207b2..27e3cbc2fe8d4e512b7702c4a3d10fa423237104 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.8_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T3.js
index 8dee0779c00507ba1bee7b6312ff2c61cb5eea17..214cb50100a02160cb1872db5b946ae026d5d340 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.8_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T4.js
index 67e2de3a63d8007fb19e64931aba8b28c2c939bc..718e63da48a4e6c2a1cacb4616b827c6742936fc 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.8_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T5.js
index 3982a1d6d3cfc936e917a23528c68c22eff42bd3..bfc058a2c1a01eae745a2d80f065a1f7146ddcaf 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.8_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.8_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.8_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T1.js
index be6ee5e30ea286f5457910bd04f26e739b91fac4..94e81f1ed1bd489108c67b29c111162afcd34d13 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.9_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T2.js b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T2.js
index 01f7fd62399f3f0ed5fd629e31d84b290ec14de8..abb0e075f440652c1981b0a5af39f7369883c0d9 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T2.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.9_T2
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T3.js b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T3.js
index 3ef60424c56adab8ddf72b14c02b153467b6605d..a383c8c93f8dd23687f86009401a3a55fbba5fe1 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T3.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.9_T3
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T4.js b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T4.js
index eaedb8c7deb6c10bb7e1d98ff7dd80841e461a9c..f3c9a35e5f4f0918ea5f846b1116b0f71b85d8c6 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T4.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.9_T4
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T5.js b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T5.js
index dd0465397f25c78901fe6b76428856790b6fca05..7fff695d4108a2c20874d3b5dc8ada91eef54a21 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A5.9_T5.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A5.9_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A5.9_T5
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.10_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.10_T1.js
index 6806d2ea4651ca3b0501c30da9c1598416534115..5b3da32b64b15931309bc84017b79f719529441f 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.10_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.10_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.10_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.11_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.11_T1.js
index 64920b83c9b83000a3ef121f32f31d694b55df57..d9419f622536b0210f2ebfc11b008120067d6c67 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.11_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.11_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.11_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.1_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.1_T1.js
index bc0814916fc4ae748b258bef0933fc126ee3bfef..07bbfcd68e60fec00837636ea32fba3b7a47929d 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.1_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.1_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.1_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.2_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.2_T1.js
index fbb90b84540e3074406d93917aa839a4ac42ae73..9badae1ef9e8014e897da6ebfa09eb990274ad8d 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.2_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.2_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.2_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.3_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.3_T1.js
index d8fc7146f628a6a0be79e310e6957544ea338110..3f860d2f3a50c1409da24b984715aacdf4d0340f 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.3_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.3_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.3_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.4_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.4_T1.js
index 3bb0664ffc8a0ea70f0ac1519fb8f4a7936ba14a..0def953475ca026b6b38723ff8fbc97616345623 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.4_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.4_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.4_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.5_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.5_T1.js
index 0d1b98117facc6eab295cb14a27fc900ac730cd3..c373c0588110e17cfc086f1610d3ab81696458ba 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.5_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.5_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.5_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.6_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.6_T1.js
index 0e39ce67992d9b095caf6c5b9cb53cfbd670048b..12d78357e0dbdc0f7646e21ff1904680d1334c7d 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.6_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.6_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.6_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.7_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.7_T1.js
index 9e24083772ca8c219ad5d08b37feaa4a910f143f..df09cca89fc6accfb4e50cd76cc883ca81c06129 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.7_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.7_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.7_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.8_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.8_T1.js
index f5be57cdda7bd751d73c12fd0fc29dcd3a0b04f1..d19cc547703bc8874d0ffc1ea1389f48521c7be8 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.8_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.8_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.8_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/compound-assignment/S11.13.2_A6.9_T1.js b/test/language/expressions/compound-assignment/S11.13.2_A6.9_T1.js
index df40895a809145b32a6f6397ec42511fdb8a7d4a..acbc699a5ba8446e3b1506dc096891c43ae63e68 100755
--- a/test/language/expressions/compound-assignment/S11.13.2_A6.9_T1.js
+++ b/test/language/expressions/compound-assignment/S11.13.2_A6.9_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Compound Assignment Operator calls PutValue(lref, v)
+es5id: S11.13.2_A6.9_T1
 description: >
     Evaluating LeftHandSideExpression lref returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A5_T1.js b/test/language/expressions/postfix-decrement/S11.3.2_A5_T1.js
index fb43d87f161c9a22221222a72b3a873ab0cd94bc..34603e252886b270dbefaa29f97b04f516dcfe4d 100755
--- a/test/language/expressions/postfix-decrement/S11.3.2_A5_T1.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A5_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x-- calls PutValue(lhs, newValue)
+es5id: S11.3.2_A5_T1
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A5_T2.js b/test/language/expressions/postfix-decrement/S11.3.2_A5_T2.js
index 26f96a385544e8ba7181954d567e51a0ddeb5ba6..a5f818fd8be2fb52ba384c4688bd02d7a4ef3de7 100755
--- a/test/language/expressions/postfix-decrement/S11.3.2_A5_T2.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A5_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x-- calls PutValue(lhs, newValue)
+es5id: S11.3.2_A5_T2
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A5_T3.js b/test/language/expressions/postfix-decrement/S11.3.2_A5_T3.js
index 6446e8728758387cc0df3fabb763f4a21249fb91..ea7a20067423149786bb9dcaaef9f42618649649 100755
--- a/test/language/expressions/postfix-decrement/S11.3.2_A5_T3.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A5_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x-- calls PutValue(lhs, newValue)
+es5id: S11.3.2_A5_T3
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A5_T4.js b/test/language/expressions/postfix-decrement/S11.3.2_A5_T4.js
index aa01013595e0e482c1bf92008de3bc83b268c1a3..1b4f49d40546ab60ffd22c9cf92f3dcf0e07060d 100755
--- a/test/language/expressions/postfix-decrement/S11.3.2_A5_T4.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A5_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x-- calls PutValue(lhs, newValue)
+es5id: S11.3.2_A5_T4
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A5_T5.js b/test/language/expressions/postfix-decrement/S11.3.2_A5_T5.js
index 6a6c183222dcdc9ca48db22358ab0b11f165cef4..fa8eccfb892fcd6276dfa2f9d286d4e7d8dc980d 100755
--- a/test/language/expressions/postfix-decrement/S11.3.2_A5_T5.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A5_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x-- calls PutValue(lhs, newValue)
+es5id: S11.3.2_A5_T5
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A5_T1.js b/test/language/expressions/postfix-increment/S11.3.1_A5_T1.js
index 2b4bcd0532655eba61ad712a547e031bdc2ec7bb..9726066cc80732dee92f8165861ec0def144f41b 100755
--- a/test/language/expressions/postfix-increment/S11.3.1_A5_T1.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A5_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x++ calls PutValue(lhs, newValue)
+es5id: S11.3.1_A5_T1
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A5_T2.js b/test/language/expressions/postfix-increment/S11.3.1_A5_T2.js
index ade4a0a9b05b46098172b3154688ed6a2a77f351..5aa614c0c29330dcea74dc73da1e6483f106bf6c 100755
--- a/test/language/expressions/postfix-increment/S11.3.1_A5_T2.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A5_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x++ calls PutValue(lhs, newValue)
+es5id: S11.3.1_A5_T2
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A5_T3.js b/test/language/expressions/postfix-increment/S11.3.1_A5_T3.js
index 6e3c717193cd3b3c085a9ceb205199965ae6fe47..c9a6a664544d909c0d02aa9166aa64d6a95cc9f2 100755
--- a/test/language/expressions/postfix-increment/S11.3.1_A5_T3.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A5_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x++ calls PutValue(lhs, newValue)
+es5id: S11.3.1_A5_T3
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A5_T4.js b/test/language/expressions/postfix-increment/S11.3.1_A5_T4.js
index 41468ff55318dc676d1958775184a8f289e034e7..f4733d98ad053396c1edac606eabd32aab45394e 100755
--- a/test/language/expressions/postfix-increment/S11.3.1_A5_T4.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A5_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x++ calls PutValue(lhs, newValue)
+es5id: S11.3.1_A5_T4
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A5_T5.js b/test/language/expressions/postfix-increment/S11.3.1_A5_T5.js
index a078046187430da4f22b6010ee84ba230b7eeee9..12248a0e027fcdcb66d42c376748f0d12d0766e7 100755
--- a/test/language/expressions/postfix-increment/S11.3.1_A5_T5.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A5_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator x++ calls PutValue(lhs, newValue)
+es5id: S11.3.1_A5_T5
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-decrement/S11.4.5_A5_T1.js b/test/language/expressions/prefix-decrement/S11.4.5_A5_T1.js
index a868280068a69d2912e732530332def8a50cdf84..8fe26228395f5d545fb3f5de3cf95434acb1a07a 100755
--- a/test/language/expressions/prefix-decrement/S11.4.5_A5_T1.js
+++ b/test/language/expressions/prefix-decrement/S11.4.5_A5_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator --x calls PutValue(lhs, newValue)
+es5id: S11.4.5_A5_T1
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-decrement/S11.4.5_A5_T2.js b/test/language/expressions/prefix-decrement/S11.4.5_A5_T2.js
index a501cb6308204492a9c3b0a27721d9afd24a6633..f8ec5a8cac9ab5ca5298a9bf78bec1ff517a6502 100755
--- a/test/language/expressions/prefix-decrement/S11.4.5_A5_T2.js
+++ b/test/language/expressions/prefix-decrement/S11.4.5_A5_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator --x calls PutValue(lhs, newValue)
+es5id: S11.4.5_A5_T2
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-decrement/S11.4.5_A5_T3.js b/test/language/expressions/prefix-decrement/S11.4.5_A5_T3.js
index 0925e780dc76342be1557966271afceb8f861c71..03d94128a58d82e4b2d82cf8fa31da120ce755e7 100755
--- a/test/language/expressions/prefix-decrement/S11.4.5_A5_T3.js
+++ b/test/language/expressions/prefix-decrement/S11.4.5_A5_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator --x calls PutValue(lhs, newValue)
+es5id: S11.4.5_A5_T3
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-decrement/S11.4.5_A5_T4.js b/test/language/expressions/prefix-decrement/S11.4.5_A5_T4.js
index 58476799a391c4bb634884cd5dfab1e6e3a7b2c0..d9de0395ea14eb95da011c136b6f7c39508408f4 100755
--- a/test/language/expressions/prefix-decrement/S11.4.5_A5_T4.js
+++ b/test/language/expressions/prefix-decrement/S11.4.5_A5_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator --x calls PutValue(lhs, newValue)
+es5id: S11.4.5_A5_T4
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-decrement/S11.4.5_A5_T5.js b/test/language/expressions/prefix-decrement/S11.4.5_A5_T5.js
index 2bfe66d60602baef967957d6285b7c630fce93e8..d7df814ccee24605dc8711d52906662b01183594 100755
--- a/test/language/expressions/prefix-decrement/S11.4.5_A5_T5.js
+++ b/test/language/expressions/prefix-decrement/S11.4.5_A5_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator --x calls PutValue(lhs, newValue)
+es5id: S11.4.5_A5_T5
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-increment/S11.4.4_A5_T1.js b/test/language/expressions/prefix-increment/S11.4.4_A5_T1.js
index f01ee32aba330d474ec2fe516a1c006e31cb771f..aef00eead39d66fa548d5b6a30c9c4e5a770bcb5 100755
--- a/test/language/expressions/prefix-increment/S11.4.4_A5_T1.js
+++ b/test/language/expressions/prefix-increment/S11.4.4_A5_T1.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator ++x calls PutValue(lhs, newValue)
+es5id: S11.4.4_A5_T1
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-increment/S11.4.4_A5_T2.js b/test/language/expressions/prefix-increment/S11.4.4_A5_T2.js
index 09f0d48a438a3022de7f30ad9ff8d2cd3c5f8136..6d5721dd995885d1e74d8f273eeef6297cc90e75 100755
--- a/test/language/expressions/prefix-increment/S11.4.4_A5_T2.js
+++ b/test/language/expressions/prefix-increment/S11.4.4_A5_T2.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator ++x calls PutValue(lhs, newValue)
+es5id: S11.4.4_A5_T2
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-increment/S11.4.4_A5_T3.js b/test/language/expressions/prefix-increment/S11.4.4_A5_T3.js
index f9cf3cebed0aa7be791f49a90fb69734dc2cd57e..e333de2a8bf5f246f7a2aec2465451830fb2c402 100755
--- a/test/language/expressions/prefix-increment/S11.4.4_A5_T3.js
+++ b/test/language/expressions/prefix-increment/S11.4.4_A5_T3.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator ++x calls PutValue(lhs, newValue)
+es5id: S11.4.4_A5_T3
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-increment/S11.4.4_A5_T4.js b/test/language/expressions/prefix-increment/S11.4.4_A5_T4.js
index 12178597b8bab4f5255af8325d1ac83014181cc1..67bfcd11b3bdb22d99f310f0a633c0ed8cbee07a 100755
--- a/test/language/expressions/prefix-increment/S11.4.4_A5_T4.js
+++ b/test/language/expressions/prefix-increment/S11.4.4_A5_T4.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator ++x calls PutValue(lhs, newValue)
+es5id: S11.4.4_A5_T4
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is
diff --git a/test/language/expressions/prefix-increment/S11.4.4_A5_T5.js b/test/language/expressions/prefix-increment/S11.4.4_A5_T5.js
index 8702266b9b4c507a55b006ac51dd47ca99cc411c..95953b1e01881b2b5d030b9b0ddd542307a69386 100755
--- a/test/language/expressions/prefix-increment/S11.4.4_A5_T5.js
+++ b/test/language/expressions/prefix-increment/S11.4.4_A5_T5.js
@@ -3,6 +3,7 @@
 
 /*---
 info: Operator ++x calls PutValue(lhs, newValue)
+es5id: S11.4.4_A5_T5
 description: >
     Evaluating LeftHandSideExpression lhs returns Reference type; Reference
     base value is an environment record and environment record kind is