diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js
index d0fbba3ad1..16c116659d 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = 110xxxxx (n = 2) and string.charAt(k + 4) and
     string.charAt(k + 5) do not represent hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.10_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests
 ---*/
 
@@ -16,15 +18,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
       decodeURI("%C0%" + String.fromCharCode(indexJ, indexJ));
-      result = false;      
-    } catch (e) {   
+      result = false;
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
-        result = false;        
+        result = false;
       }
-    }      
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If B = 110xxxxx (n = 2) and (string.charAt(k + 4) and  string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js
index 651ee79b99..1aad74e682 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js
@@ -7,6 +7,8 @@ info: >
     string.charAt(k + 5)) or (string.charAt(k + 7) and
     string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.11_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests, string.charAt(k + 4) and string.charAt(k + 5)  do
     not represent hexadecimal digits
@@ -19,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
       decodeURI("%E0%" + String.fromCharCode(indexJ, indexJ) + "%A0");
-      result = false;      
-    } catch (e) {   
+      result = false;
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
-        result = false;        
+        result = false;
       }
-    }      
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and  string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js
index 2fc6e80c64..4e0a40c7bd 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js
@@ -7,6 +7,8 @@ info: >
     string.charAt(k + 5)) or (string.charAt(k + 7) and
     string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.11_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests, string.charAt(k + 7) and string.charAt(k + 8)  do
     not represent hexadecimal digits
@@ -19,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
       decodeURI("%E0%" + "%A0" + String.fromCharCode(indexJ, indexJ));
-      result = false;      
-    } catch (e) {   
+      result = false;
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
-        result = false;        
+        result = false;
       }
-    }      
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 7) and  string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js
index 971af19f8e..15f3a97dcc 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js
@@ -8,6 +8,8 @@ info: >
     string.charAt(k + 8)) or (string.charAt(k + 10) and
     string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.12_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests, string.charAt(k + 4) and string.charAt(k + 5)  do
     not represent hexadecimal digits
@@ -20,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
       decodeURI("%F0%" + String.fromCharCode(indexJ, indexJ) + "%A0%A0");
-      result = false;      
-    } catch (e) {   
+      result = false;
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
-        result = false;        
+        result = false;
       }
-    }      
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js
index b0e3495094..55ee69928f 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js
@@ -8,6 +8,8 @@ info: >
     string.charAt(k + 8)) or (string.charAt(k + 10) and
     string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.12_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests, string.charAt(k + 7) and string.charAt(k + 7)  do
     not represent hexadecimal digits
@@ -20,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
       decodeURI("%F0%" + "%A0" + String.fromCharCode(indexJ, indexJ) + "%A0");
-      result = false;      
-    } catch (e) {   
+      result = false;
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
-        result = false;        
+        result = false;
       }
-    }      
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js
index 0b859725c7..c714d05783 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js
@@ -8,6 +8,8 @@ info: >
     string.charAt(k + 8)) or (string.charAt(k + 10) and
     string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.12_T3
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests, string.charAt(k + 10) and string.charAt(k + 11)  do
     not represent hexadecimal digits
@@ -20,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
       decodeURI("%F0%" + "%A0%A0" + String.fromCharCode(indexJ, indexJ));
-      result = false;      
-    } catch (e) {   
+      result = false;
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
-        result = false;        
+        result = false;
       }
-    }      
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.13_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.13_T1.js
index d97fc87d9e..0d980a487b 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.13_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.13_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.13_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xC0; indexB <= 0xDF; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + hexC);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.13_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.13_T2.js
index 62767984b2..c1d9cecedc 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.13_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.13_T2.js
@@ -6,6 +6,8 @@ info: >
     If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.13_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xC0; indexB <= 0xDF; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + hexC);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T1.js
index e63fa0bcab..412575127d 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.14_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + hexC + "%A0");
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T2.js
index 35b721e83e..2e2a2b0cc3 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T2.js
@@ -6,6 +6,8 @@ info: >
     If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.14_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + "%A0" + hexC);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T3.js
index c3c6e6c1fb..315a7a4c01 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T3.js
@@ -6,6 +6,8 @@ info: >
     If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.14_T3
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + hexC + "%A0");
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T4.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T4.js
index eca2066287..6ab3b3ed83 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T4.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T4.js
@@ -6,6 +6,8 @@ info: >
     If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.14_T4
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + "%A0" + hexC);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T1.js
index 7eb031a2ef..14e97441d9 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.15_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + hexC + "%A0%A0");
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T2.js
index ac8a83160f..ca13d5e665 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T2.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.15_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + "%A0" + hexC + "%A0");
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T3.js
index 25e23d51e5..59b01b0cda 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T3.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.15_T3
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + "%A0%A0" + hexC);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T4.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T4.js
index 83b84fe685..2bd806f743 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T4.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T4.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.15_T4
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + hexC + "%A0%A0");
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T5.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T5.js
index caad3a8b45..1253544963 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T5.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T5.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.15_T5
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + "%A0" + hexC + "%A0");
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T6.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T6.js
index 5fa20665c7..d8fc333ac3 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T6.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T6.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
     throw URIError
 es5id: 15.1.3.1_A1.15_T6
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var indexP;
 var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
-  count++; 
+  count++;
   var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
     var hexC = decimalToPercentHexString(indexC);
     try {
       decodeURI(hexB + "%A0%A0" + hexC);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = indexB;
     } else {
-      if ((indexB - indexP) !== 1) {             
+      if ((indexB - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = indexB;
-      }         
+      }
     }
     indexP = indexB;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js
index 0dd267a99d..2ee47854c0 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError
 es5id: 15.1.3.1_A1.1_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js
index e6ccf035f3..0bfc46bfe7 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = string.charAt(k+1) + string.charAt(k+2) do not represent
     hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.2_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests
 ---*/
 
@@ -17,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
     try {
       decodeURI("%" + String.fromCharCode(indexJ) + "1");
       result = false;
-    } catch (e) {   
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
         result = false;
       }
-    }    
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If string.charAt(k+1) does not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js
index 986b49c6e0..2a0b33e659 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js
@@ -6,6 +6,8 @@ info: >
     If B = string.charAt(k+1) + string.charAt(k+2) do not represent
     hexadecimal digits, throw URIError
 es5id: 15.1.3.1_A1.2_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests
 ---*/
 
@@ -17,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
     try {
       decodeURI("%" + "1" + String.fromCharCode(indexJ));
       result = false;
-    } catch (e) {   
+    } catch (e) {
       if ((e instanceof URIError) !== true) {
         result = false;
       }
-    }      
-  }  
-}  
+    }
+  }
+}
 
-if (result !== true) {    
+if (result !== true) {
   $ERROR('#1: If string.charAt(k+2) does not represent hexadecimal digits, throw URIError');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.3_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.3_T1.js
index 636c05160e..1b1dba7ec4 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.3_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.3_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If B = 10xxxxxx or B = 11111xxx, throw URIError
 es5id: 15.1.3.1_A1.3_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF]
 includes: [decimalToHexString.js]
 ---*/
@@ -14,31 +16,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0x80; index <= 0xBF; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex);
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -49,6 +51,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.3_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.3_T2.js
index a00a58dea2..c9914c50c2 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.3_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.3_T2.js
@@ -4,6 +4,8 @@
 /*---
 info: If B = 10xxxxxx or B = 11111xxx, throw URIError
 es5id: 15.1.3.1_A1.3_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF]
 includes: [decimalToHexString.js]
 ---*/
@@ -14,31 +16,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xF8; index <= 0xFF; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex);
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -49,6 +51,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.4_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.4_T1.js
index 5bc6fc1043..6ca4f2d415 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.4_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.4_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError
 es5id: 15.1.3.1_A1.4_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xC0 - 0xDF]
 includes: [decimalToHexString.js]
 ---*/
@@ -14,39 +16,39 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xC0; index <= 0xDF; index++) {
-  count++; 
+  count++;
   var str = "";
   var result = true;
   for (var len = 0; len < 3; len++) {
     var hex = decimalToPercentHexString(index);
     try {
       decodeURI(hex + str);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
     str = str + "1";
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = index;
     } else {
-      if ((index - indexP) !== 1) {             
+      if ((index - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = index;
-      }         
+      }
     }
     indexP = index;
-    errorCount++;      
-  } 
+    errorCount++;
+  }
 }
 
 if (errorCount > 0) {
@@ -57,6 +59,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.5_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.5_T1.js
index a6ed0d021f..21a7aa0e70 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.5_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.5_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError
 es5id: 15.1.3.1_A1.5_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xE0 - 0xEF]
 includes: [decimalToHexString.js]
 ---*/
@@ -14,39 +16,39 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xE0; index <= 0xEF; index++) {
-  count++; 
+  count++;
   var str = "";
   var result = true;
   for (var len = 0; len < 6; len++) {
     var hex = decimalToPercentHexString(index);
     try {
       decodeURI(hex + str);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
     str = str + "1";
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = index;
     } else {
-      if ((index - indexP) !== 1) {             
+      if ((index - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = index;
-      }         
+      }
     }
     indexP = index;
-    errorCount++;      
-  } 
+    errorCount++;
+  }
 }
 
 if (errorCount > 0) {
@@ -57,6 +59,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.6_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.6_T1.js
index fcdc4c821b..7c7e35d073 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.6_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.6_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError
 es5id: 15.1.3.1_A1.6_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xF0 - 0xF7]
 includes: [decimalToHexString.js]
 ---*/
@@ -14,39 +16,39 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
-  count++; 
+  count++;
   var str = "";
   var result = true;
   for (var len = 0; len < 9; len++) {
     var hex = decimalToPercentHexString(index);
     try {
       decodeURI(hex + str);
-    } catch (e) { 
-      if ((e instanceof URIError) === true) continue;                
+    } catch (e) {
+      if ((e instanceof URIError) === true) continue;
     }
     result = false;
     str = str + "1";
   }
   if (result !== true) {
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = index;
     } else {
-      if ((index - indexP) !== 1) {             
+      if ((index - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = index;
-      }         
+      }
     }
     indexP = index;
-    errorCount++;      
-  } 
+    errorCount++;
+  }
 }
 
 if (errorCount > 0) {
@@ -57,6 +59,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.7_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.7_T1.js
index 502fb1edfd..dac7d1cb43 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.7_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.7_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = 110xxxxx (n = 2) and string.charAt(k + 3) not equal "%", throw
     URIError
 es5id: 15.1.3.1_A1.7_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests. B = [0xC0 - 0xDF]
 includes: [decimalToHexString.js]
 ---*/
@@ -16,31 +18,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xC0; index <= 0xDF; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex + "111");
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -51,6 +53,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.8_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.8_T1.js
index 85d6657f21..3ecca0b37b 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.8_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.8_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = 1110xxxx (n = 3) and string.charAt(k + 3),
     string.charAt(k + 6) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.8_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 3) not equal "%"
 includes: [decimalToHexString.js]
@@ -17,31 +19,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xE0; index <= 0xEF; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex + "111%A0");
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -52,6 +54,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.8_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.8_T2.js
index 89303e011e..59e54cd847 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.8_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.8_T2.js
@@ -6,6 +6,8 @@ info: >
     If B = 1110xxxx (n = 3) and string.charAt(k + 3),
     string.charAt(k + 6) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.8_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 6) not equal "%"
 includes: [decimalToHexString.js]
@@ -17,31 +19,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xE0; index <= 0xEF; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex + "%A0111");
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -52,6 +54,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T1.js
index 2ec5d9b9db..70e7f37c1f 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T1.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and string.charAt(k + 3),
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.9_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 3) not equal "%"
 includes: [decimalToHexString.js]
@@ -17,31 +19,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex + "111%A0%A0");
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -52,6 +54,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T2.js
index 7d1f1808c2..7f4e55fb9f 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T2.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and string.charAt(k + 3),
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.9_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 6) not equal "%"
 includes: [decimalToHexString.js]
@@ -17,31 +19,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex + "%A0111%A0");
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -52,6 +54,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T3.js
index 8289d50a9a..88648791e7 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T3.js
@@ -6,6 +6,8 @@ info: >
     If B = 11110xxx (n = 4) and string.charAt(k + 3),
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.9_T3
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 9) not equal "%"
 includes: [decimalToHexString.js]
@@ -17,31 +19,31 @@ var indexP;
 var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
-  count++; 
+  count++;
   var hex = decimalToPercentHexString(index);
   try {
     decodeURI(hex + "%A0%A0111");
-  } catch (e) { 
-    if ((e instanceof URIError) === true) continue;                
+  } catch (e) {
+    if ((e instanceof URIError) === true) continue;
   }
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;       
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -52,6 +54,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js
index 15890e3459..477ef8460c 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If string.charAt(k) not equal "%", return this char
 es5id: 15.1.3.1_A2.1_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests
 includes: [decimalToHexString.js]
 ---*/
@@ -14,20 +16,20 @@ var count = 0;
 for (var indexI = 0; indexI <= 65535; indexI++) {
   if (indexI !== 0x25) {
     var hex = decimalToHexString(indexI);
-    try {    
+    try {
       var str = String.fromCharCode(indexI);
-      if (decodeURI(str) !== str) {    
+      if (decodeURI(str) !== str) {
         $ERROR('#' + hex + ' ');
         errorCount++;
-      }    
+      }
     } catch (e){
       $ERROR('#' + hex + ' ');
       errorCount++;
-    } 
+    }
     count++;
   }
-}  
+}
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js
index 143ea88f07..71e8c31d44 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: If B1 = 0xxxxxxxx ([0x00 - 0x7F]), without [uriReserved, #], return B1
 es5id: 15.1.3.1_A2.2_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
@@ -14,10 +16,10 @@ var indexP;
 var indexO = 0;
 var uriReserved = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","];
 l:
-for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {       
+for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {
   count++;
   var hexB1 = decimalToPercentHexString(indexB1);
-  var index = indexB1;  
+  var index = indexB1;
   var hex = String.fromCharCode(index);
   for (var indexC = 0; indexC < uriReserved.length; indexC++) {
     if (hex === uriReserved[indexC]) continue l;
@@ -25,24 +27,24 @@ for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {
   if (hex === "#") continue;
   if (decodeURI(hexB1) === hex) continue;
 
-  if (indexO === 0) { 
+  if (indexO === 0) {
     indexO = index;
   } else {
-    if ((index - indexP) !== 1) {             
+    if ((index - indexP) !== 1) {
       if ((indexP - indexO) !== 0) {
         var hexP = decimalToHexString(indexP);
         var hexO = decimalToHexString(indexO);
         $ERROR('#' + hexO + '-' + hexP + ' ');
-      } 
+      }
       else {
         var hexP = decimalToHexString(indexP);
         $ERROR('#' + hexP + ' ');
-      }  
+      }
       indexO = index;
-    }         
+    }
   }
   indexP = index;
-  errorCount++;         
+  errorCount++;
 }
 
 if (errorCount > 0) {
@@ -53,6 +55,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A2.3_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.3_T1.js
index 5a0786823d..02aeafbf75 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A2.3_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A2.3_T1.js
@@ -6,6 +6,8 @@ info: >
     If B1 = 110xxxxx ([0xC0 - 0xDF]), B2 = 10xxxxxx ([0x80 - 0xBF), without
     B1 = [0xC0, 0xC1], return UTF8(B1, B2)
 es5id: 15.1.3.1_A2.3_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
@@ -15,32 +17,32 @@ var count = 0;
 var indexP;
 var indexO = 0;
 
-for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) {     
+for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) {
   var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     count++;
     var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
-    var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F);  
+    var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F);
     if (decodeURI(hexB1_B2) === String.fromCharCode(index)) continue;
 
-    if (indexO === 0) { 
+    if (indexO === 0) {
       indexO = index;
     } else {
-      if ((index - indexP) !== 1) {             
+      if ((index - indexP) !== 1) {
         if ((indexP - indexO) !== 0) {
           var hexP = decimalToHexString(indexP);
           var hexO = decimalToHexString(indexO);
           $ERROR('#' + hexO + '-' + hexP + ' ');
-        } 
+        }
         else {
           var hexP = decimalToHexString(indexP);
           $ERROR('#' + hexP + ' ');
-        }  
+        }
         indexO = index;
-      }         
+      }
     }
     indexP = index;
-    errorCount++;       
+    errorCount++;
   }
 }
 
@@ -52,6 +54,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A2.4_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.4_T1.js
index edb3b78fca..628b40b11d 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A2.4_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A2.4_T1.js
@@ -7,6 +7,8 @@ info: >
     without [B1, B2] = [0xE0, 0x80 - 0x9F], [0xED, 0xA0 - 0xBF] (0xD800 -
     0xDFFF), return UTF8(B1, B2, B3)
 es5id: 15.1.3.1_A2.4_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
@@ -16,37 +18,37 @@ var count = 0;
 var indexP;
 var indexO = 0;
 
-for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) {     
+for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) {
   var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     if ((indexB1 === 0xE0) && (indexB2 <= 0x9F)) continue;
-    if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue;         
+    if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue;
     var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) {
       count++;
       var hexB1_B2_B3 = hexB1_B2 + decimalToPercentHexString(indexB3);
-      var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F);  
+      var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F);
       if (decodeURI(hexB1_B2_B3) === String.fromCharCode(index)) continue;
 
-      if (indexO === 0) { 
+      if (indexO === 0) {
         indexO = index;
       } else {
-        if ((index - indexP) !== 1) {             
+        if ((index - indexP) !== 1) {
           if ((indexP - indexO) !== 0) {
             var hexP = decimalToHexString(indexP);
             var hexO = decimalToHexString(indexO);
             $ERROR('#' + hexO + '-' + hexP + ' ');
-          } 
+          }
           else {
             var hexP = decimalToHexString(indexP);
             $ERROR('#' + hexP + ' ');
-          }  
+          }
           indexO = index;
-        }         
+        }
       }
       indexP = index;
-      errorCount++;  
-    }     
+      errorCount++;
+    }
   }
 }
 
@@ -58,6 +60,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A2.5_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.5_T1.js
index 72e98b6e9a..7550935add 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A2.5_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A2.5_T1.js
@@ -7,6 +7,8 @@ info: >
     0xBF]), without [B1, B2] = [0xF0, 0x80 - 0x9F], [0xF4, 0x90 - 0xBF],
     return UTF8(B1, B2, B3, B4)
 es5id: 15.1.3.1_A2.5_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex tests, use RFC 3629
 includes: [decimalToHexString.js]
 ---*/
@@ -16,10 +18,10 @@ var count = 0;
 var indexP;
 var indexO = 0;
 
-for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {     
+for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {
   var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
-    if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue;            
+    if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue;
     if ((indexB1 === 0xF4) && (indexB2 >= 0x90)) continue;
     var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) {
@@ -29,29 +31,29 @@ for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {
         count++;
         var index = (indexB1 & 0x07) * 0x40000 + (indexB2 & 0x3F) * 0x1000 + (indexB3 & 0x3F) * 0x40 + (indexB4 & 0x3F);
         var L = ((index - 0x10000) & 0x03FF) + 0xDC00;
-        var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800;  
+        var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800;
         if (decodeURI(hexB1_B2_B3_B4) === String.fromCharCode(H, L)) continue;
 
-        if (indexO === 0) { 
+        if (indexO === 0) {
           indexO = index;
         } else {
-          if ((index - indexP) !== 1) {             
+          if ((index - indexP) !== 1) {
             if ((indexP - indexO) !== 0) {
               var hexP = decimalToHexString(indexP);
               var hexO = decimalToHexString(indexO);
               $ERROR('#' + hexO + '-' + hexP + ' ');
-            } 
+            }
             else {
               var hexP = decimalToHexString(indexP);
               $ERROR('#' + hexP + ' ');
-            }  
+            }
             indexO = index;
-          }         
+          }
         }
         indexP = index;
-        errorCount++;  
+        errorCount++;
       }
-    }     
+    }
   }
 }
 
@@ -63,6 +65,6 @@ if (errorCount > 0) {
   } else {
     var hexP = decimalToHexString(indexP);
     $ERROR('#' + hexP + ' ');
-  }     
+  }
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A3_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A3_T1.js
index a2ccfc4562..f4e3409fed 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A3_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A3_T1.js
@@ -6,6 +6,8 @@ info: >
     Let reservedURISet be a string containing one instance of each character valid
     in uriReserved plus "#"
 es5id: 15.1.3.1_A3_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking all character in reservedURISet. HexDigit in [0..9, A..F]
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A3_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A3_T2.js
index f1c2381de2..5288213095 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A3_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A3_T2.js
@@ -6,6 +6,8 @@ info: >
     Let reservedURISet be a string containing one instance of each character valid
     in uriReserved plus "#"
 es5id: 15.1.3.1_A3_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking all character in reservedURISet. HexDigit in [0..9, a..f]
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A3_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A3_T3.js
index 13155b20e9..1e7ec6b0fe 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A3_T3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A3_T3.js
@@ -6,6 +6,8 @@ info: >
     Let reservedURISet be a string containing one instance of each character valid
     in uriReserved plus "#"
 es5id: 15.1.3.1_A3_T3
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Complex test
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A4_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A4_T1.js
index 5fd65e132f..d8bdf45cf4 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A4_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A4_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.1_A4_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking ENGLISH ALPHABET
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A4_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A4_T2.js
index 0a7f272c46..a26ed467e9 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A4_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A4_T2.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.1_A4_T2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking RUSSIAN ALPHABET
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A4_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A4_T3.js
index 0b47260950..0944ffee86 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A4_T3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A4_T3.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.1_A4_T3
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking URL with Line Terminator
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A4_T4.js b/test/built-ins/decodeURI/S15.1.3.1_A4_T4.js
index d95a04f9f4..ced956a032 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A4_T4.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A4_T4.js
@@ -4,6 +4,8 @@
 /*---
 info: URI tests
 es5id: 15.1.3.1_A4_T4
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Test some url
 ---*/
 
@@ -20,7 +22,7 @@ if (decodeURI("http:%2f%2Funipro.ru") !== "http:%2f%2Funipro.ru") {
 //CHECK#3
 if (decodeURI("http://www.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork") !== "http://www.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork") {
   $ERROR('#3: http://www.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork"');
-}           
+}
 
 //CHECK%234
 if (decodeURI("http://en.wikipedia.org/wiki/UTF-8%23Description") !== "http://en.wikipedia.org/wiki/UTF-8%23Description") {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.1.js b/test/built-ins/decodeURI/S15.1.3.1_A5.1.js
index de7789c846..a5517ed7ec 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.1.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of decodeURI has the attribute DontEnum
 es5id: 15.1.3.1_A5.1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking use propertyIsEnumerable, for-in
 ---*/
 
@@ -17,7 +19,7 @@ var result = true;
 for (var p in decodeURI){
   if (p === "length") {
     result = false;
-  }  
+  }
 }
 
 if (result !== true) {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.2.js b/test/built-ins/decodeURI/S15.1.3.1_A5.2.js
index e04c71cd10..c16dd48bb3 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.2.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of decodeURI does not have the attribute DontDelete
 es5id: 15.1.3.1_A5.2
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking use hasOwnProperty, delete
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.3.js b/test/built-ins/decodeURI/S15.1.3.1_A5.3.js
index 3aca2c3478..3e46c50ddd 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.3.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of decodeURI has the attribute ReadOnly
 es5id: 15.1.3.1_A5.3
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking if varying the length property fails
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.4.js b/test/built-ins/decodeURI/S15.1.3.1_A5.4.js
index fb30642d68..0da5a16c81 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.4.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.4.js
@@ -4,6 +4,8 @@
 /*---
 info: The length property of decodeURI is 1
 es5id: 15.1.3.1_A5.4
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: decodeURI.length === 1
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.5.js b/test/built-ins/decodeURI/S15.1.3.1_A5.5.js
index 65ed3c570b..c088525b2c 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.5.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.5.js
@@ -4,6 +4,8 @@
 /*---
 info: The decodeURI property has the attribute DontEnum
 es5id: 15.1.3.1_A5.5
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking use propertyIsEnumerable, for-in
 ---*/
 
@@ -17,7 +19,7 @@ var result = true;
 for (var p in this){
   if (p === "decodeURI") {
     result = false;
-  }  
+  }
 }
 
 if (result !== true) {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.6.js b/test/built-ins/decodeURI/S15.1.3.1_A5.6.js
index bafc5f6682..285aeee3a9 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.6.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.6.js
@@ -4,6 +4,8 @@
 /*---
 info: The decodeURI property has not prototype property
 es5id: 15.1.3.1_A5.6
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: Checking decodeURI.prototype
 ---*/
 
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.7.js b/test/built-ins/decodeURI/S15.1.3.1_A5.7.js
index 7253d3d506..f883620207 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.7.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.7.js
@@ -4,6 +4,8 @@
 /*---
 info: The decodeURI property can't be used as constructor
 es5id: 15.1.3.1_A5.7
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
     If property does not implement the internal [[Construct]] method,
     throw a TypeError exception
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js
index 37f9e60230..e3789fbdfd 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js
@@ -4,6 +4,8 @@
 /*---
 info: Operator use ToString
 es5id: 15.1.3.1_A6_T1
+es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: If Type(value) is Object, evaluate ToPrimitive(value, String)
 ---*/
 
@@ -17,7 +19,7 @@ if (decodeURI(object) !== "[object Object]") {
 var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}};
 if (decodeURI(object) !== "^") {
   $ERROR('#2: var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}}; decodeURI(object) === "^". Actual: ' + (decodeURI(object)));
-} 
+}
 
 //CHECK#3
 var object = {valueOf: function() {return "%5E"}, toString: function() {return {}}};
@@ -57,11 +59,11 @@ try {
   var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}};
   decodeURI(object);
   $ERROR('#7.1: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURI(object) throw "error". Actual: ' + (decodeURI(object)));
-}  
+}
 catch (e) {
   if (e !== "error") {
     $ERROR('#7.2: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURI(object) throw "error". Actual: ' + (e));
-  } 
+  }
 }
 
 //CHECK#8
@@ -69,9 +71,9 @@ try {
   var object = {valueOf: function() {return {}}, toString: function() {return {}}};
   decodeURI(object);
   $ERROR('#8.1: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURI(object) throw TypeError. Actual: ' + (decodeURI(object)));
-}  
+}
 catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURI(object) throw TypeError. Actual: ' + (e));
-  } 
+  }
 }
diff --git a/test/built-ins/decodeURI/name.js b/test/built-ins/decodeURI/name.js
index 75a6412b33..5bbbda33e2 100644
--- a/test/built-ins/decodeURI/name.js
+++ b/test/built-ins/decodeURI/name.js
@@ -3,6 +3,7 @@
 
 /*---
 es6id: 18.2.6.2
+esid: sec-decodeuri-encodeduri
 description: >
   decodeURI.name is "decodeURI".
 info: >