diff --git a/harness/decimalToHexString.js b/harness/decimalToHexString.js
new file mode 100644
index 0000000000000000000000000000000000000000..36a2bb5b4916362c9319f39f852e8c97bebc2f3f
--- /dev/null
+++ b/harness/decimalToHexString.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+function decimalToHexString(n) {
+  var hex = "0123456789ABCDEF";
+  n >>>= 0;
+  var s = "";
+  while (n) {
+    s = hex[n & 0xf] + s;
+    n >>>= 4;
+  }
+  while (s.length < 4) {
+    s = "0" + s;
+  }
+  return s;
+}
+
+function decimalToPercentHexString(n) {
+  var hex = "0123456789ABCDEF";
+  return "%" + hex[(n >> 4) & 0xf] + hex[n & 0xf];
+}
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 a1f9ec4868bdaaf7d9fcb7806a5a6be573b434b4..d97fc87d9ee4ec4969a7999d52253ddc767cc34a 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.13_T1
 description: Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xC0; indexB <= 0xDF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);  
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%" + hexC.substring(2));
+      decodeURI(hexB + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 f257b6b9e1c3324c6d7e1199be01c7c1994c58a4..62767984b2d35a2a0176e3e86a79fa683135f307 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.13_T2
 description: Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xC0; indexB <= 0xDF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);  
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%" + hexC.substring(2));
+      decodeURI(hexB + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 8357cea7f0b047334b69cd110a93f05f79f06725..e63fa0bcabd41a065ef3015b2735eb441562265a 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.14_T1
 description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0");
+      decodeURI(hexB + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 23c4d5f509e46d202fa6b186ecc22aedc9e7521d..35b721e83e7b0f3763008b116e73c8cfa36b30e9 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.14_T2
 description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);  
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2));
+      decodeURI(hexB + "%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 d69fdab9d97b382795051ad8e239138d8783f30f..c3c6e6c1fb98e5a9933794a774a7bb24ce3c8148 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.14_T3
 description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0");
+      decodeURI(hexB + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 2946136d76a8fa0751b6fd0c483ab0fca60ecf05..eca20662879c3f24ba9be78e507d68d3fce57dc8 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.14_T4
 description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);  
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2));
+      decodeURI(hexB + "%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 ad1febe2f75a2c7677a9f553d0ec54791bc978b1..7eb031a2ef3c9981a8796d09f478c3100d4daafe 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.15_T1
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0%A0");
+      decodeURI(hexB + hexC + "%A0%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 401a388206825aa9a93aacedbe03fc980bab516c..ac8a83160fbab0e6055486eda8177334faa8c87d 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.15_T2
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2) + "%A0");
+      decodeURI(hexB + "%A0" + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 84ba14193419f7d5d08b6f52e9e45e818ee7b786..25e23d51e571370fa29acade89a08e23263cf03e 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.15_T3
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%A0%A0" + "%" + hexC.substring(2));
+      decodeURI(hexB + "%A0%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 839911bfef2682e6b6a47fdb719d1fdc2803a5d4..83b84fe685ac530d30fbe365bc6bfbf902c68042 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.15_T4
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0%A0");
+      decodeURI(hexB + hexC + "%A0%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 11dc0284334996b753e934780f9dcf9c97b54a2b..caad3a8b45848af6231284409da8669c4b79a9ae 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.15_T5
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2) + "%A0");
+      decodeURI(hexB + "%A0" + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 50eaff52c0a3dd9bfc3184cf5292def449a0279f..5fa20665c731938adc45ba0e845462c25cf0d001 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
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.1_A1.15_T6
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB); 
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);  
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURI("%" + hexB.substring(2) + "%A0%A0" + "%" + hexC.substring(2));
+      decodeURI(hexB + "%A0%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 7125c02a751b7ed97a14ad80874ca95fc6b2852e..636c05160e96b18bdcd4b740643e4216eed9fa82 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
@@ -5,6 +5,7 @@
 info: If B = 10xxxxxx or B = 11111xxx, throw URIError
 es5id: 15.1.3.1_A1.3_T1
 description: Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -14,9 +15,9 @@ var indexO = 0;
 
 for (var index = 0x80; index <= 0xBF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2));
+    decodeURI(hex);
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 1a154784b75d6e20623c7355691fa19f211912cb..a00a58dea2265085bb3bf0593ce0bc2a73c4ac9a 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
@@ -5,6 +5,7 @@
 info: If B = 10xxxxxx or B = 11111xxx, throw URIError
 es5id: 15.1.3.1_A1.3_T2
 description: Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -14,9 +15,9 @@ var indexO = 0;
 
 for (var index = 0xF8; index <= 0xFF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2));
+    decodeURI(hex);
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 6a80cd17ab67dbad51a9e74d4a49566fcc085cef..5bc6fc10436750fcb08cb606008eb42183c92c96 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
@@ -5,6 +5,7 @@
 info: If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError
 es5id: 15.1.3.1_A1.4_T1
 description: Complex tests. B = [0xC0 - 0xDF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -17,9 +18,9 @@ for (var index = 0xC0; index <= 0xDF; index++) {
   var str = "";
   var result = true;
   for (var len = 0; len < 3; len++) {
-    var hex = decimalToHexString(index);
+    var hex = decimalToPercentHexString(index);
     try {
-      decodeURI("%" + hex.substring(2) + str);      
+      decodeURI(hex + str);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -59,27 +60,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 a8758ef18b9e5719878dde411205b8e896c8bd4e..a6ed0d021f796eb3e177519692c8dd8894495cc2 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
@@ -5,6 +5,7 @@
 info: If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError
 es5id: 15.1.3.1_A1.5_T1
 description: Complex tests. B = [0xE0 - 0xEF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -17,9 +18,9 @@ for (var index = 0xE0; index <= 0xEF; index++) {
   var str = "";
   var result = true;
   for (var len = 0; len < 6; len++) {
-    var hex = decimalToHexString(index);
+    var hex = decimalToPercentHexString(index);
     try {
-      decodeURI("%" + hex.substring(2) + str);      
+      decodeURI(hex + str);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -59,27 +60,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 3f8347af2d19dd693d9e8be7c27fdf7e44206210..fcdc4c821be7a461f6683b9deb090e2f531cbbf0 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
@@ -5,6 +5,7 @@
 info: If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError
 es5id: 15.1.3.1_A1.6_T1
 description: Complex tests. B = [0xF0 - 0xF7]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -17,9 +18,9 @@ for (var index = 0xF0; index <= 0xF7; index++) {
   var str = "";
   var result = true;
   for (var len = 0; len < 9; len++) {
-    var hex = decimalToHexString(index);
+    var hex = decimalToPercentHexString(index);
     try {
-      decodeURI("%" + hex.substring(2) + str);      
+      decodeURI(hex + str);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -59,27 +60,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 3d3b5035e18e9cfb28023ee571e81d05fa48bd3d..502fb1edfd35c369c24c50336f02553767ae0913 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
@@ -7,6 +7,7 @@ info: >
     URIError
 es5id: 15.1.3.1_A1.7_T1
 description: Complex tests. B = [0xC0 - 0xDF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,9 +17,9 @@ var indexO = 0;
 
 for (var index = 0xC0; index <= 0xDF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2) + "111");
+    decodeURI(hex + "111");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -53,27 +54,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 387cf52f7013342fe8324424f2bb9b521d66cb1f..85d6657f21220c8334f4f95e52e8e321e5d21875 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
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.8_T1
 description: >
-    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 3) not equal
-    "%"
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 3) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xE0; index <= 0xEF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2) + "111%A0");
+    decodeURI(hex + "111%A0");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 95e93cfcc90485ab20b09b8b3d8ff712a63e24f7..89303e011e61ce1eae2767b739aaa57fad38be52 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
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.8_T2
 description: >
-    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 6) not equal
-    "%"
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 6) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xE0; index <= 0xEF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2) + "%A0111");
+    decodeURI(hex + "%A0111");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 31e56157982cc4903efc7c786ce42bd7547bf18a..2ec5d9b9db9834d32943722a0de6684118813eff 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
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.9_T1
 description: >
-    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 3) not equal
-    "%"
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 3) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2) + "111%A0%A0");
+    decodeURI(hex + "111%A0%A0");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 2f19944845645346b22999306a2d36e5c0fc848e..7d1f1808c2feae331f956c628528327fc09cfe0f 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
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.9_T2
 description: >
-    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 6) not equal
-    "%"
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 6) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2) + "%A0111%A0");
+    decodeURI(hex + "%A0111%A0");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 306d946d991c772e28f1a78c61a1f24423730c99..8289d50a9af933976be07f9384ffa82a1dbd9ff5 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
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.1_A1.9_T3
 description: >
-    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 9) not equal
-    "%"
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 9) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURI("%" + hex.substring(2) + "%A0%A0111");
+    decodeURI(hex + "%A0%A0111");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 7f643eb763ecc2a86a24e4e851912e85ca68aca7..15890e3459b521c545054d26a730ca5e57bb7c5c 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
@@ -5,6 +5,7 @@
 info: If string.charAt(k) not equal "%", return this char
 es5id: 15.1.3.1_A2.1_T1
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 //CHECK
@@ -30,27 +31,3 @@ for (var indexI = 0; indexI <= 65535; indexI++) {
 if (errorCount > 0) {    
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 ec98dc2e9acfdefb92b420b6e34dc0575684e8d4..143ea88f0725682ed326e3eb306f6ed98a3b1e6c 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
@@ -5,6 +5,7 @@
 info: If B1 = 0xxxxxxxx ([0x00 - 0x7F]), without [uriReserved, #], return B1
 es5id: 15.1.3.1_A2.2_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -15,18 +16,15 @@ var uriReserved = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","];
 l:
 for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {       
   count++;
-  var hexB1 = decimalToHexString(indexB1);  
+  var hexB1 = decimalToPercentHexString(indexB1);
   var index = indexB1;  
-  try {
-    var hex = String.fromCharCode(index);
-    for (var indexC = 0; indexC < uriReserved.length; indexC++) {
-      if (hex === uriReserved[indexC]) continue l;        
-    } 
-    if (hex === "#") continue l;
-    if (decodeURI("%" + hexB1.substring(2)) === hex) continue;
-  } catch (e) {
-    if (e instanceof Test262Error) throw e;
-  }   
+  var hex = String.fromCharCode(index);
+  for (var indexC = 0; indexC < uriReserved.length; indexC++) {
+    if (hex === uriReserved[indexC]) continue l;
+  }
+  if (hex === "#") continue;
+  if (decodeURI(hexB1) === hex) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -58,27 +56,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 72458cf212b4dd669ec9fd1fb8ad41b1720aa96c..5a0786823d0edaf43912a804eff3a41296abc4e6 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
@@ -7,6 +7,7 @@ info: >
     B1 = [0xC0, 0xC1], return UTF8(B1, B2)
 es5id: 15.1.3.1_A2.3_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -15,16 +16,13 @@ var indexP;
 var indexO = 0;
 
 for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) {     
-  var hexB1 = decimalToHexString(indexB1);
+  var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     count++;
-    var hexB2 = decimalToHexString(indexB2);
+    var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F);  
-    try {
-      if (decodeURI("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;
-  } catch (e) {
-      if (e instanceof Test262Error) throw e;
-    }   
+    if (decodeURI(hexB1_B2) === String.fromCharCode(index)) continue;
+
     if (indexO === 0) { 
       indexO = index;
     } else {
@@ -57,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 6558d09a94f02c5b869f933ea18c0295e1b23fa3..edb3b78fca0650b468908aba3ca9179f36293700 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
@@ -8,6 +8,7 @@ info: >
     0xDFFF), return UTF8(B1, B2, B3)
 es5id: 15.1.3.1_A2.4_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,20 +17,17 @@ var indexP;
 var indexO = 0;
 
 for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) {     
-  var hexB1 = decimalToHexString(indexB1);
+  var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     if ((indexB1 === 0xE0) && (indexB2 <= 0x9F)) continue;
     if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue;         
-    var hexB2 = decimalToHexString(indexB2);
+    var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) {
       count++;
-      var hexB3 = decimalToHexString(indexB3);
+      var hexB1_B2_B3 = hexB1_B2 + decimalToPercentHexString(indexB3);
       var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F);  
-      try {
-        if (decodeURI("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;
-      } catch (e) {
-        if (e instanceof Test262Error) throw e;
-      }   
+      if (decodeURI(hexB1_B2_B3) === String.fromCharCode(index)) continue;
+
       if (indexO === 0) { 
         indexO = index;
       } else {
@@ -63,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
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 b164850dc35b7112cd7dde04ae11eec8b2e460c6..72e98b6e9af0d4b2b1c15274dd5a494565f7a9dc 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
@@ -8,6 +8,7 @@ info: >
     return UTF8(B1, B2, B3, B4)
 es5id: 15.1.3.1_A2.5_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,24 +17,21 @@ var indexP;
 var indexO = 0;
 
 for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {     
-  var hexB1 = decimalToHexString(indexB1);
+  var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue;            
     if ((indexB1 === 0xF4) && (indexB2 >= 0x90)) continue;
-    var hexB2 = decimalToHexString(indexB2);
+    var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) {
-      var hexB3 = decimalToHexString(indexB3);
+      var hexB1_B2_B3 = hexB1_B2 + decimalToPercentHexString(indexB3);
       for (var indexB4 = 0x80; indexB4 <= 0xBF; indexB4++) {
-        var hexB4 = decimalToHexString(indexB4);
+        var hexB1_B2_B3_B4 = hexB1_B2_B3 + decimalToPercentHexString(indexB4);
         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;  
-        try {
-          if (decodeURI("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;
-        } catch (e) {
-          if (e instanceof Test262Error) throw e;
-        }   
+        if (decodeURI(hexB1_B2_B3_B4) === String.fromCharCode(H, L)) continue;
+
         if (indexO === 0) { 
           indexO = index;
         } else {
@@ -68,27 +66,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 4; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js
index 4aa20cee26f475032d12afed45e19341f3e36714..978e7517a9fd291afa8e7266ffece89bbb7df667 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.13_T1
 description: Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xC0; indexB <= 0xDF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%" + hexC.substring(2));
+      decodeURIComponent(hexB + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js
index bba768aac2bbf7e577c37817e453c146af97c651..cac109a3337cdc94a94cbdbf0ec5467fd1bda50a 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.13_T2
 description: Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xC0; indexB <= 0xDF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%" + hexC.substring(2));
+      decodeURIComponent(hexB + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js
index 3f4ce70a37a6aeabc3204da303c4919ab451e43b..1993a13420ef1195767ded25df858c5daf4c29b1 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.14_T1
 description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0");
+      decodeURIComponent(hexB + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js
index b028c21a3e32db4ec893ba02f744d2edabc86d29..5d5c9a737665c45b2928641be76d73ee93d44fce 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.14_T2
 description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2));
+      decodeURIComponent(hexB + "%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js
index 690481bdc60e79e8183a1b1a639ed1713ce1b527..6153a209323d99bddc8fbc33260d2881895d42d5 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.14_T3
 description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0");
+      decodeURIComponent(hexB + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js
index 4c2d987473e79aa4b0d45d787bc4319ada5d84e7..04a8121d15bde67d7adb3757158647bf3b3175b3 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.14_T4
 description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xE0; indexB <= 0xEF; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2));
+      decodeURIComponent(hexB + "%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js
index 28861fab192a8ae894e226893de3cc126de1bd07..322785b1e28a9dfe759013b7e4d45aed9d06954c 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.15_T1
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0%A0");
+      decodeURIComponent(hexB + hexC + "%A0%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js
index 6937c01f283814fad3f18159b34e16276a8a9f40..a6a40ba88ecdd117fe3b2ae4954329487c61c2bf 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.15_T2
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2) + "%A0");
+      decodeURIComponent(hexB + "%A0" + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js
index cb966fd6bdc347cf34eaacb557e2f24529af0ae0..f503082b2cefe4ea7d7ba75dbccd664a7bb3cb75 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.15_T3
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0x00; indexC <= 0x7F; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%A0%A0" + "%" + hexC.substring(2));
+      decodeURIComponent(hexB + "%A0%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js
index dff7c9a8501a5fe5fd3a1fa9c62700b9ee14fdcc..b75279148123913ba0d82f7e2323a24f15fade84 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.15_T4
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%" + hexC.substring(2) + "%A0%A0");
+      decodeURIComponent(hexB + hexC + "%A0%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js
index 0220be857d97886db8c935a8d25b9cdd3c142cda..072aabdd6562a0e5adc7fac3bd822185af47c5a0 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.15_T5
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%A0" + "%" + hexC.substring(2) + "%A0");
+      decodeURIComponent(hexB + "%A0" + hexC + "%A0");
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js
index 02941b07e6f49046ef0a8bc715ca176c09220257..777672e792255b11adc14a93d93fac8f4153d351 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js
@@ -7,6 +7,7 @@ info: >
     throw URIError
 es5id: 15.1.3.2_A1.15_T6
 description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,12 @@ var indexO = 0;
 
 for (var indexB = 0xF0; indexB <= 0xF7; indexB++) {
   count++; 
-  var hexB = decimalToHexString(indexB);
+  var hexB = decimalToPercentHexString(indexB);
   var result = true;
   for (var indexC = 0xC0; indexC <= 0xFF; indexC++) {
-    var hexC = decimalToHexString(indexC);
+    var hexC = decimalToPercentHexString(indexC);
     try {
-      decodeURIComponent("%" + hexB.substring(2) + "%A0%A0" + "%" + hexC.substring(2));
+      decodeURIComponent(hexB + "%A0%A0" + hexC);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -60,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js
index 98a0977a78a744a9e4d8f6c36dd1bc2e99787724..99073d74dd29b6cab85bcdcc8d37db59ff986074 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js
@@ -5,6 +5,7 @@
 info: If B = 10xxxxxx or B = 11111xxx, throw URIError
 es5id: 15.1.3.2_A1.3_T1
 description: Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -14,9 +15,9 @@ var indexO = 0;
 
 for (var index = 0x80; index <= 0xBF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2));
+    decodeURIComponent(hex);
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js
index 9d0bfc1667fd306713464d82e17d745598531a39..d4cdfc6ff6922352f3fbcb29632aeacafc5838f2 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js
@@ -5,6 +5,7 @@
 info: If B = 10xxxxxx or B = 11111xxx, throw URIError
 es5id: 15.1.3.2_A1.3_T2
 description: Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -14,9 +15,9 @@ var indexO = 0;
 
 for (var index = 0xF8; index <= 0xFF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2));
+    decodeURIComponent(hex);
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js
index 7e88a8d05f81f1194695e17e3bf70f6817ff4ec9..97108d76a6916942400f7c0987da10c7897e24df 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js
@@ -5,6 +5,7 @@
 info: If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError
 es5id: 15.1.3.2_A1.4_T1
 description: Complex tests. B = [0xC0 - 0xDF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -17,9 +18,9 @@ for (var index = 0xC0; index <= 0xDF; index++) {
   var str = "";
   var result = true;
   for (var len = 0; len < 3; len++) {
-    var hex = decimalToHexString(index);
+    var hex = decimalToPercentHexString(index);
     try {
-      decodeURIComponent("%" + hex.substring(2) + str);      
+      decodeURIComponent(hex + str);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -59,27 +60,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js
index ef72254a57735748f0256342396ca8898bf24774..782bb26d40a764de6e8d8718b494fa99eef1fd90 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js
@@ -5,6 +5,7 @@
 info: If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError
 es5id: 15.1.3.2_A1.5_T1
 description: Complex tests. B = [0xE0 - 0xEF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -17,9 +18,9 @@ for (var index = 0xE0; index <= 0xEF; index++) {
   var str = "";
   var result = true;
   for (var len = 0; len < 6; len++) {
-    var hex = decimalToHexString(index);
+    var hex = decimalToPercentHexString(index);
     try {
-      decodeURIComponent("%" + hex.substring(2) + str);      
+      decodeURIComponent(hex + str);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -59,27 +60,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js
index 3c68d04c682a746d06c7995327bf60ea3bb20961..8e5e0f676444b270c0ed8c7697959b830cc03eca 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js
@@ -5,6 +5,7 @@
 info: If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError
 es5id: 15.1.3.2_A1.6_T1
 description: Complex tests. B = [0xF0 - 0xF7]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -17,9 +18,9 @@ for (var index = 0xF0; index <= 0xF7; index++) {
   var str = "";
   var result = true;
   for (var len = 0; len < 9; len++) {
-    var hex = decimalToHexString(index);
+    var hex = decimalToPercentHexString(index);
     try {
-      decodeURIComponent("%" + hex.substring(2) + str);      
+      decodeURIComponent(hex + str);
     } catch (e) { 
       if ((e instanceof URIError) === true) continue;                
     }
@@ -59,27 +60,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js
index 092e4602def1f18e6738c225369ff9e60b1117ff..488c589d3f20eec76b6ee491316d236de5debc06 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js
@@ -7,6 +7,7 @@ info: >
     URIError
 es5id: 15.1.3.2_A1.7_T1
 description: Complex tests. B = [0xC0 - 0xDF]
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,9 +17,9 @@ var indexO = 0;
 
 for (var index = 0xC0; index <= 0xDF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2) + "111");
+    decodeURIComponent(hex + "111");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -53,27 +54,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js
index 6871ba649a717849480710bc480a0ad324e73977..672cc544378a36a9ad3a6f74c3db2eb3b0099db1 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6) not equal "%", throw URIError
 es5id: 15.1.3.2_A1.8_T1
 description: >
-    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 3) not equal
-    "%"
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 3) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xE0; index <= 0xEF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2) + "111%A0");
+    decodeURIComponent(hex + "111%A0");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js
index 5a5c1df077c318b9d35ff11f95ecc43d8b2e4386..d562ac053ec94bf2cb80c4ebcc96ca0f5e632045 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6) not equal "%", throw URIError
 es5id: 15.1.3.2_A1.8_T2
 description: >
-    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 6) not equal
-    "%"
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 6) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xE0; index <= 0xEF; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2) + "%A0111");
+    decodeURIComponent(hex + "%A0111");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js
index 8b3ebb23fef633067533fd4dee2a39bc9d5f11e4..f2b31216a2e877c0dfd5d264bd3c3f24d619e742 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.2_A1.9_T1
 description: >
-    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 3) not equal
-    "%"
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 3) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2) + "111%A0%A0");
+    decodeURIComponent(hex + "111%A0%A0");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js
index 664cc07d32fff52323f45000697c0ac518248656..1033aa1ae2a69cd4063a4510b4ad8e112a898c2b 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.2_A1.9_T2
 description: >
-    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 6) not equal
-    "%"
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 6) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2) + "%A0111%A0");
+    decodeURIComponent(hex + "%A0111%A0");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js
index 5f5813ace89cd1c36831dafacc06d469fbbf7cd9..22f48126d888487fa46c43b7ace422cfd71f3128 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js
@@ -7,8 +7,8 @@ info: >
     string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
 es5id: 15.1.3.2_A1.9_T3
 description: >
-    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 9) not equal
-    "%"
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 9) not equal "%"
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -18,9 +18,9 @@ var indexO = 0;
 
 for (var index = 0xF0; index <= 0xF7; index++) {
   count++; 
-  var hex = decimalToHexString(index);
+  var hex = decimalToPercentHexString(index);
   try {
-    decodeURIComponent("%" + hex.substring(2) + "%A0%A0111");
+    decodeURIComponent(hex + "%A0%A0111");
   } catch (e) { 
     if ((e instanceof URIError) === true) continue;                
   }
@@ -55,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js
index 6e5b14179e83fbb8b42b59dd8abc161afe1807ab..05c7db39f78244aa6b56ff0af97aecf43b3fd718 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js
@@ -5,6 +5,7 @@
 info: If string.charAt(k) not equal "%", return this char
 es5id: 15.1.3.2_A2.1_T1
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 //CHECK
@@ -30,27 +31,3 @@ for (var indexI = 0; indexI <= 65535; indexI++) {
 if (errorCount > 0) {    
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js
index 6d6811929e634d1442762fd078f9fb5bb5d4c47b..59074ba2dd1760a2a61d9afcbfb92aee59db9848 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js
@@ -5,6 +5,7 @@
 info: If B1 = 0xxxxxxxx ([0x00 - 0x7F]), return B1
 es5id: 15.1.3.2_A2.2_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -13,14 +14,11 @@ var indexP;
 var indexO = 0;
 for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {
   count++;
-  var hexB1 = decimalToHexString(indexB1);  
+  var hexB1 = decimalToPercentHexString(indexB1);
   var index = indexB1;  
-  try {
-    var hex = String.fromCharCode(index);
-    if (decodeURIComponent("%" + hexB1.substring(2)) === hex) continue;
-  } catch (e) {
-    if (e instanceof Test262Error) throw e;
-  }   
+  var hex = String.fromCharCode(index);
+  if (decodeURIComponent(hexB1) === hex) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -52,27 +50,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js
index 2d40ec6644272185fc79a9d5feebe96f70573617..14edea9c3b199200b21321aacf0c6afcd500a1db 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js
@@ -7,6 +7,7 @@ info: >
     B1 = [0xC0, 0xC1], return UTF8(B1, B2)
 es5id: 15.1.3.2_A2.3_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -15,16 +16,13 @@ var indexP;
 var indexO = 0;
 
 for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) {
-  var hexB1 = decimalToHexString(indexB1);
+  var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     count++;
-    var hexB2 = decimalToHexString(indexB2);
+    var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F);  
-    try {
-      if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;
-    } catch (e) {
-      if (e instanceof Test262Error) throw e;
-    }   
+    if (decodeURIComponent(hexB1_B2) === String.fromCharCode(index)) continue;
+
     if (indexO === 0) { 
       indexO = index;
     } else {
@@ -57,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js
index 03adf9a89e64989bd03aeb2b0b928b7f86cfa613..8c6678e8f6951b119b1a6c8843e898298e70c648 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js
@@ -8,6 +8,7 @@ info: >
     0xDFFF), return UTF8(B1, B2, B3)
 es5id: 15.1.3.2_A2.4_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,20 +17,17 @@ var indexP;
 var indexO = 0;
 
 for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) {
-  var hexB1 = decimalToHexString(indexB1);
+  var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     if ((indexB1 === 0xE0) && (indexB2 <= 0x9F)) continue;
     if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue;         
-    var hexB2 = decimalToHexString(indexB2);
+    var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) {
       count++;
-      var hexB3 = decimalToHexString(indexB3);
+      var hexB1_B2_B3 = hexB1_B2 + decimalToPercentHexString(indexB3);
       var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F);  
-      try {
-        if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;
-      } catch (e) {
-        if (e instanceof Test262Error) throw e;
-      }
+      if (decodeURIComponent(hexB1_B2_B3) === String.fromCharCode(index)) continue;
+
       if (indexO === 0) { 
         indexO = index;
       } else {
@@ -63,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js
index 6a2d55ae71d4d478cad011c4376e6915fe14150e..42cbda2245f6b9bd7c6937c92bc27b223419cec2 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js
@@ -8,6 +8,7 @@ info: >
     return UTF8(B1, B2, B3, B4)
 es5id: 15.1.3.2_A2.5_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,24 +17,21 @@ var indexP;
 var indexO = 0;
 
 for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {
-  var hexB1 = decimalToHexString(indexB1);
+  var hexB1 = decimalToPercentHexString(indexB1);
   for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) {
     if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue;            
     if ((indexB1 === 0xF4) && (indexB2 >= 0x90)) continue;
-    var hexB2 = decimalToHexString(indexB2);
+    var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2);
     for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) {
-      var hexB3 = decimalToHexString(indexB3);
+      var hexB1_B2_B3 = hexB1_B2 + decimalToPercentHexString(indexB3);
       for (var indexB4 = 0x80; indexB4 <= 0xBF; indexB4++) {
-        var hexB4 = decimalToHexString(indexB4);
+        var hexB1_B2_B3_B4 = hexB1_B2_B3 + decimalToPercentHexString(indexB4);
         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;  
-        try {
-          if (decodeURIComponent("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;
-        } catch (e) {
-          if (e instanceof Test262Error) throw e;
-        }   
+        if (decodeURIComponent(hexB1_B2_B3_B4) === String.fromCharCode(H, L)) continue;
+
         if (indexO === 0) { 
           indexO = index;
         } else {
@@ -68,27 +66,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 4; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js
index 35da750488366bc7bfe8ecaf0a0c7a3c8294d4ba..781519c5eb8b77c47076db74705a765d3af73fb5 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T1.js
@@ -5,6 +5,7 @@
 info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
 es5id: 15.1.3.3_A1.1_T1
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js
index b52327b992e7c224bde74339538d7db5b60fa5f8..0d3b4a97006ed38164a8e0565f5416a06b374812 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.1_T2.js
@@ -5,6 +5,7 @@
 info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
 es5id: 15.1.3.3_A1.1_T2
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js
index 0180fd539ec76c27500100fffa486a4a6e7e0294..26cb4751a08ee9b406956366a84404af8a34fcc4 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T1.js
@@ -7,6 +7,7 @@ info: >
     URIError
 es5id: 15.1.3.3_A1.2_T1
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -53,27 +54,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js
index c23c66be6ac5481333a7f0fdd7aa7ebc412a4888..d55e3bfaffd8ab1ab244b23b13ef7abfa6f34131 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.2_T2.js
@@ -7,6 +7,7 @@ info: >
     URIError
 es5id: 15.1.3.3_A1.2_T2
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -53,27 +54,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js
index 20ffa343775433ad6db51a3e838fea0e8c8b50ee..74acbdace1c60de479f5f00ff3bd364b20b1c7fc 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A1.3_T1.js
@@ -9,6 +9,7 @@ es5id: 15.1.3.3_A1.3_T1
 description: >
     Complex tests, string.charAt(k+1) in [0x0000, 0xD7FF, 0xD800,
     0xDBFE, 0xDBFF, 0xE000, 0xFFFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var chars = [0x0000, 0xD7FF, 0xD800, 0xDBFE, 0xDBFF, 0xE000, 0xFFFF];
@@ -62,27 +63,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
index 9cbd48a4bb1525f5c243536af3288d86c5aaaa89..7074472ac527c1cc8b255060f29c838ebffe7c38 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
@@ -7,6 +7,7 @@ info: >
     return 1 octet (00000000 0zzzzzzz -> 0zzzzzzz)
 es5id: 15.1.3.3_A2.1_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var uriReserved = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","];
@@ -27,9 +28,8 @@ for (var index = 0x0000; index <= 0x007F; index++) {
     if (uriUnescaped[indexC] === str) continue l;
   }    
   if ("#" === str) continue l; 
-  try {
-    if (encodeURI(str).toUpperCase() === "%" + decimalToHexString(index).substring(2)) continue l; 
-  } catch(e) {}     
+  if (encodeURI(str).toUpperCase() === decimalToPercentHexString(index)) continue l;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -61,27 +61,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
index 32d069d8c6610e0d2e0ded17b38821e3960cb08d..e293339abefaf8a0e7a3abd055fb2d7a2dec7478 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
@@ -7,6 +7,7 @@ info: >
     yyzzzzzz -> 110yyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.2_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,11 @@ var indexO = 0;
 l:
 for (var index = 0x0080; index <= 0x07FF; index++) {
   count++;  
-  var hex1 = decimalToHexString(0x0080 + (index & 0x003F)).substring(2);
-  var hex2 = decimalToHexString(0x00C0 + (index & 0x07C0) / 0x0040).substring(2);
+  var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
+  var hex2 = decimalToPercentHexString(0x00C0 + (index & 0x07C0) / 0x0040);
   var str = String.fromCharCode(index);
-  try {
-    if (encodeURI(str).toUpperCase() === "%" + hex2 + "%" + hex1) continue;
-  } catch(e) {}  
+  if (encodeURI(str).toUpperCase() === hex2 + hex1) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -53,27 +53,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js
index 9a6588fab130f3dd2411534884962acc5ff329ef..c12383a20fccf8b0bdf9e78c6cb7b2303f73b420 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.3_T1.js
@@ -7,6 +7,7 @@ info: >
     yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.3_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -15,13 +16,12 @@ var indexP;
 var indexO = 0; 
 for (var index = 0x0800; index <= 0xD7FF; index++) {
   count++; 
-  var hex1 = decimalToHexString(0x0080 + (index & 0x003F)).substring(2);
-  var hex2 = decimalToHexString(0x0080 + (index & 0x0FC0) / 0x0040).substring(2);
-  var hex3 = decimalToHexString(0x00E0 + (index & 0xF000) / 0x1000).substring(2);
+  var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
+  var hex2 = decimalToPercentHexString(0x0080 + (index & 0x0FC0) / 0x0040);
+  var hex3 = decimalToPercentHexString(0x00E0 + (index & 0xF000) / 0x1000);
   var str = String.fromCharCode(index);
-  try {
-    if (encodeURI(str).toUpperCase() === "%" + hex3 + "%" + hex2 + "%" + hex1) continue;
-  } catch(e) {}      
+  if (encodeURI(str).toUpperCase() === hex3 + hex2 + hex1) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -53,27 +53,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js
index 7c98072e490a5fc5e69570e4d779c7aea07071f6..838b038bde00ce271d2735641583dac931b3b3f9 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T1.js
@@ -10,6 +10,7 @@ es5id: 15.1.3.3_A2.4_T1
 description: >
     Complex tests, use RFC 3629, string.charAt(k+1) in [0xDC00,
     0xDDFF, 0xDFFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var chars = [0xDC00, 0xDDFF, 0xDFFF];
@@ -21,16 +22,14 @@ for (var index = 0xD800; index <= 0xDBFF; index++) {
   var res = true;
   for (var indexC = 0; indexC < chars.length; indexC++) {
     var index1 = (index - 0xD800) * 0x400 + (chars[indexC] - 0xDC00) + 0x10000;
-    var hex1 = decimalToHexString(0x0080 + (index1 & 0x003F)).substring(2);
-    var hex2 = decimalToHexString(0x0080 + (index1 & 0x0FC0) / 0x0040).substring(2);
-    var hex3 = decimalToHexString(0x0080 + (index1 & 0x3F000) / 0x1000).substring(2);
-    var hex4 = decimalToHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000).substring(2);
+    var hex1 = decimalToPercentHexString(0x0080 + (index1 & 0x003F));
+    var hex2 = decimalToPercentHexString(0x0080 + (index1 & 0x0FC0) / 0x0040);
+    var hex3 = decimalToPercentHexString(0x0080 + (index1 & 0x3F000) / 0x1000);
+    var hex4 = decimalToPercentHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000);
     var str = String.fromCharCode(index, chars[indexC]);
-    try {
-      if (encodeURI(str).toUpperCase() !== "%" + hex4 + "%" + hex3 + "%" + hex2 + "%" + hex1) {
-        res = false;
-      }
-    } catch(e) {res = false}    
+    if (encodeURI(str).toUpperCase() === hex4 + hex3 + hex2 + hex1) continue;
+
+    res = false;
   }
   if (res !== true) {  
     if (indexO === 0) { 
@@ -66,27 +65,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js
index 45887396eb39ecc85733d821c1adc73058f64bcf..9d6643f908d8393f2cae2bf93eea223f8d7c7ef5 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.4_T2.js
@@ -10,6 +10,7 @@ es5id: 15.1.3.3_A2.4_T2
 description: >
     Complex tests, use RFC 3629, string.charAt(k) in [0xD800, 0xDBFF,
     0xD9FF]
+includes: [decimalToHexString.js]
 ---*/
 
 var chars = [0xD800, 0xDBFF, 0xD9FF];
@@ -21,16 +22,14 @@ for (var index = 0xDC00; index <= 0xDFFF; index++) {
   var res = true;
   for (var indexC = 0; indexC < chars.length; indexC++) {
     var index1 = (chars[indexC] - 0xD800) * 0x400 + (index - 0xDC00) + 0x10000;
-    var hex1 = decimalToHexString(0x0080 + (index1 & 0x003F)).substring(2);
-    var hex2 = decimalToHexString(0x0080 + (index1 & 0x0FC0) / 0x0040).substring(2);
-    var hex3 = decimalToHexString(0x0080 + (index1 & 0x3F000) / 0x1000).substring(2);
-    var hex4 = decimalToHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000).substring(2);
+    var hex1 = decimalToPercentHexString(0x0080 + (index1 & 0x003F));
+    var hex2 = decimalToPercentHexString(0x0080 + (index1 & 0x0FC0) / 0x0040);
+    var hex3 = decimalToPercentHexString(0x0080 + (index1 & 0x3F000) / 0x1000);
+    var hex4 = decimalToPercentHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000);
     var str = String.fromCharCode(chars[indexC], index);
-    try {
-      if (encodeURI(str).toUpperCase() !== "%" + hex4 + "%" + hex3 + "%" + hex2 + "%" + hex1) {
-        res = false;
-      }
-    } catch(e) {res = false}    
+    if (encodeURI(str).toUpperCase() === hex4 + hex3 + hex2 + hex1) continue;
+
+    res = false;
   }
   if (res !== true) {  
     if (indexO === 0) { 
@@ -66,27 +65,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js
index cf21872824750e9ee8c5273a1be5c24c5a06877e..21bd6e5a555e00253e3a40a88d3084aab53dbc86 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.5_T1.js
@@ -7,6 +7,7 @@ info: >
     yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.3_A2.5_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -15,13 +16,12 @@ var indexP;
 var indexO = 0; 
 for (var index = 0xE000; index <= 0xFFFF; index++) {
   count++;  
-  var hex1 = decimalToHexString(0x0080 + (index & 0x003F)).substring(2);
-  var hex2 = decimalToHexString(0x0080 + (index & 0x0FC0) / 0x0040).substring(2);
-  var hex3 = decimalToHexString(0x00E0 + (index & 0xF000) / 0x1000).substring(2);
+  var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
+  var hex2 = decimalToPercentHexString(0x0080 + (index & 0x0FC0) / 0x0040);
+  var hex3 = decimalToPercentHexString(0x00E0 + (index & 0xF000) / 0x1000);
   var str = String.fromCharCode(index);
-  try {
-    if (encodeURI(str).toUpperCase() === "%" + hex3 + "%" + hex2 + "%" + hex1) continue;
-  } catch(e) {}      
+  if (encodeURI(str).toUpperCase() === hex3 + hex2 + hex1) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -53,27 +53,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T1.js
index 99fd5ae1e01f127eafb8d450ffc1288aaea6035f..3e16943a2aee74b73e172c624cdac7526b25e6e0 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T1.js
@@ -5,6 +5,7 @@
 info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
 es5id: 15.1.3.4_A1.1_T1
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T2.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T2.js
index ba5316447e1f129c05151555b6b0d43b06c7d839..a5cf69ae0e608af6fbbeaceb8fdfac78c03e6e43 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T2.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.1_T2.js
@@ -5,6 +5,7 @@
 info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
 es5id: 15.1.3.4_A1.1_T2
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -51,27 +52,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T1.js
index 740356e67638ef17c4e1a0a7214b3ea3e31f1186..99db50d9f80b19ee1558ea168313a8545adb8e8a 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T1.js
@@ -7,6 +7,7 @@ info: >
     URIError
 es5id: 15.1.3.4_A1.2_T1
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -53,27 +54,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T2.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T2.js
index c60733689a68428eb0c452b08a65a543db5881b3..fb406d723c70dd1dc399415604d3fd4fceeec858 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T2.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.2_T2.js
@@ -7,6 +7,7 @@ info: >
     URIError
 es5id: 15.1.3.4_A1.2_T2
 description: Complex tests
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -53,27 +54,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.3_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.3_T1.js
index d63f0f3bc87bfa3c1f0bc0232eff0adcee91abaf..1338e6b58931fcdbcca0af7b8f66f7904a33277a 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A1.3_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A1.3_T1.js
@@ -9,6 +9,7 @@ es5id: 15.1.3.4_A1.3_T1
 description: >
     Complex tests, string.charAt(k+1) in [0x0000, 0xD7FF, 0xD800,
     0xDBFE, 0xDBFF, 0xE000, 0xFFFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var chars = [0x0000, 0xD7FF, 0xD800, 0xDBFE, 0xDBFF, 0xE000, 0xFFFF];
@@ -62,27 +63,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.1_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.1_T1.js
index 808dce688d86832b1070b1507fb0ce30518079f2..1f09fa39e06d592fb789d0e933fb9ed596a9514f 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.1_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.1_T1.js
@@ -7,6 +7,7 @@ info: >
     (00000000 0zzzzzzz -> 0zzzzzzz)
 es5id: 15.1.3.4_A2.1_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var uriUnescaped = ["-", "_", ".", "!", "~", "*", "'", "(", ")", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
@@ -22,9 +23,8 @@ for (var index = 0x0000; index <= 0x007F; index++) {
     for (var indexC = 0; indexC < uriUnescaped.length; indexC++) {
     if (uriUnescaped[indexC] === str) continue l;
   }    
-  try {
-    if (encodeURIComponent(str).toUpperCase() === "%" + decimalToHexString(index).substring(2)) continue l; 
-  } catch(e) {}     
+  if (encodeURIComponent(str).toUpperCase() === decimalToPercentHexString(index)) continue l;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -56,27 +56,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.2_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.2_T1.js
index eccd3cdaa950d666a24bad62c24bd6d5b701be23..8ee2d440d04eeb61ea5a87b6a522fa0a23b3612d 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.2_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.2_T1.js
@@ -7,6 +7,7 @@ info: >
     yyzzzzzz -> 110yyyyy 10zzzzzz)
 es5id: 15.1.3.4_A2.2_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -16,12 +17,11 @@ var indexO = 0;
 l:
 for (var index = 0x0080; index <= 0x07FF; index++) {
   count++;  
-  var hex1 = decimalToHexString(0x0080 + (index & 0x003F)).substring(2);
-  var hex2 = decimalToHexString(0x00C0 + (index & 0x07C0) / 0x0040).substring(2);
+  var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
+  var hex2 = decimalToPercentHexString(0x00C0 + (index & 0x07C0) / 0x0040);
   var str = String.fromCharCode(index);
-  try {
-    if (encodeURIComponent(str).toUpperCase() === "%" + hex2 + "%" + hex1) continue;
-  } catch(e) {}  
+  if (encodeURIComponent(str).toUpperCase() === hex2 + hex1) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -53,27 +53,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.3_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.3_T1.js
index 41ada6f405c22c4f2f677fd233a1b98276b08213..c2dd431315a95443b786bd0c2941f3e91a9036cb 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.3_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.3_T1.js
@@ -7,6 +7,7 @@ info: >
     yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.4_A2.3_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -15,13 +16,12 @@ var indexP;
 var indexO = 0; 
 for (var index = 0x0800; index <= 0xD7FF; index++) {
   count++; 
-  var hex1 = decimalToHexString(0x0080 + (index & 0x003F)).substring(2);
-  var hex2 = decimalToHexString(0x0080 + (index & 0x0FC0) / 0x0040).substring(2);
-  var hex3 = decimalToHexString(0x00E0 + (index & 0xF000) / 0x1000).substring(2);
+  var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
+  var hex2 = decimalToPercentHexString(0x0080 + (index & 0x0FC0) / 0x0040);
+  var hex3 = decimalToPercentHexString(0x00E0 + (index & 0xF000) / 0x1000);
   var str = String.fromCharCode(index);
-  try {
-    if (encodeURIComponent(str).toUpperCase() === "%" + hex3 + "%" + hex2 + "%" + hex1) continue;
-  } catch(e) {}      
+  if (encodeURIComponent(str).toUpperCase() === hex3 + hex2 + hex1) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -53,27 +53,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T1.js
index bb7ba1ddb6f528c15724f679b59159ee4083c5f6..94164c98c1da6b9ee4419c055df195fef9e8839b 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T1.js
@@ -10,6 +10,7 @@ es5id: 15.1.3.4_A2.4_T1
 description: >
     Complex tests, use RFC 3629, string.charAt(k+1) in [0xDC00,
     0xDDFF, 0xDFFF]
+includes: [decimalToHexString.js]
 ---*/
 
 var chars = [0xDC00, 0xDDFF, 0xDFFF];
@@ -21,16 +22,14 @@ for (var index = 0xD800; index <= 0xDBFF; index++) {
   var res = true;
   for (var indexC = 0; indexC < chars.length; indexC++) {
     var index1 = (index - 0xD800) * 0x400 + (chars[indexC] - 0xDC00) + 0x10000;
-    var hex1 = decimalToHexString(0x0080 + (index1 & 0x003F)).substring(2);
-    var hex2 = decimalToHexString(0x0080 + (index1 & 0x0FC0) / 0x0040).substring(2);
-    var hex3 = decimalToHexString(0x0080 + (index1 & 0x3F000) / 0x1000).substring(2);
-    var hex4 = decimalToHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000).substring(2);
+    var hex1 = decimalToPercentHexString(0x0080 + (index1 & 0x003F));
+    var hex2 = decimalToPercentHexString(0x0080 + (index1 & 0x0FC0) / 0x0040);
+    var hex3 = decimalToPercentHexString(0x0080 + (index1 & 0x3F000) / 0x1000);
+    var hex4 = decimalToPercentHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000);
     var str = String.fromCharCode(index, chars[indexC]);
-    try {
-      if (encodeURIComponent(str).toUpperCase() !== "%" + hex4 + "%" + hex3 + "%" + hex2 + "%" + hex1) {
-        res = false;
-      }
-    } catch(e) {res = false}    
+    if (encodeURIComponent(str).toUpperCase() === hex4 + hex3 + hex2 + hex1) continue;
+
+    res = false;
   }
   if (res !== true) {  
     if (indexO === 0) { 
@@ -66,27 +65,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T2.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T2.js
index 9ff448ecba431cd672c4d4bf371b31907408fa27..3fd3d0a4c2320c61715e95dd0db4c6e8992719d8 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T2.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.4_T2.js
@@ -10,6 +10,7 @@ es5id: 15.1.3.4_A2.4_T2
 description: >
     Complex tests, use RFC 3629, string.charAt(k) in [0xD800, 0xDBFF,
     0xD9FF]
+includes: [decimalToHexString.js]
 ---*/
 
 var chars = [0xD800, 0xDBFF, 0xD9FF];
@@ -21,16 +22,14 @@ for (var index = 0xDC00; index <= 0xDFFF; index++) {
   var res = true;
   for (var indexC = 0; indexC < chars.length; indexC++) {
     var index1 = (chars[indexC] - 0xD800) * 0x400 + (index - 0xDC00) + 0x10000;
-    var hex1 = decimalToHexString(0x0080 + (index1 & 0x003F)).substring(2);
-    var hex2 = decimalToHexString(0x0080 + (index1 & 0x0FC0) / 0x0040).substring(2);
-    var hex3 = decimalToHexString(0x0080 + (index1 & 0x3F000) / 0x1000).substring(2);
-    var hex4 = decimalToHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000).substring(2);
+    var hex1 = decimalToPercentHexString(0x0080 + (index1 & 0x003F));
+    var hex2 = decimalToPercentHexString(0x0080 + (index1 & 0x0FC0) / 0x0040);
+    var hex3 = decimalToPercentHexString(0x0080 + (index1 & 0x3F000) / 0x1000);
+    var hex4 = decimalToPercentHexString(0x00F0 + (index1 & 0x1C0000) / 0x40000);
     var str = String.fromCharCode(chars[indexC], index);
-    try {
-      if (encodeURIComponent(str).toUpperCase() !== "%" + hex4 + "%" + hex3 + "%" + hex2 + "%" + hex1) {
-        res = false;
-      }
-    } catch(e) {res = false}    
+    if (encodeURIComponent(str).toUpperCase() === hex4 + hex3 + hex2 + hex1) continue;
+
+    res = false;
   }
   if (res !== true) {  
     if (indexO === 0) { 
@@ -66,27 +65,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.5_T1.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.5_T1.js
index 22f7445e79fe3b9ce011acfe045ac18ebd2a73f7..2f68bcf052953a14f4220e4fd7fd8424c5a6a6d4 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A2.5_T1.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A2.5_T1.js
@@ -7,6 +7,7 @@ info: >
     yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
 es5id: 15.1.3.4_A2.5_T1
 description: Complex tests, use RFC 3629
+includes: [decimalToHexString.js]
 ---*/
 
 var errorCount = 0;
@@ -15,13 +16,12 @@ var indexP;
 var indexO = 0; 
 for (var index = 0xE000; index <= 0xFFFF; index++) {
   count++;  
-  var hex1 = decimalToHexString(0x0080 + (index & 0x003F)).substring(2);
-  var hex2 = decimalToHexString(0x0080 + (index & 0x0FC0) / 0x0040).substring(2);
-  var hex3 = decimalToHexString(0x00E0 + (index & 0xF000) / 0x1000).substring(2);
+  var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
+  var hex2 = decimalToPercentHexString(0x0080 + (index & 0x0FC0) / 0x0040);
+  var hex3 = decimalToPercentHexString(0x00E0 + (index & 0xF000) / 0x1000);
   var str = String.fromCharCode(index);
-  try {
-    if (encodeURIComponent(str).toUpperCase() === "%" + hex3 + "%" + hex2 + "%" + hex1) continue;
-  } catch(e) {}      
+  if (encodeURIComponent(str).toUpperCase() === hex3 + hex2 + hex1) continue;
+
   if (indexO === 0) { 
     indexO = index;
   } else {
@@ -53,27 +53,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/parseFloat/S15.1.2.3_A6.js b/test/built-ins/parseFloat/S15.1.2.3_A6.js
index a9983ac2788656e199143345ba3b2144ff36a159..a1fc0eead0d9efc2b6bbe4335fa6264c7a4d1562 100644
--- a/test/built-ins/parseFloat/S15.1.2.3_A6.js
+++ b/test/built-ins/parseFloat/S15.1.2.3_A6.js
@@ -9,6 +9,7 @@ info: >
     characters were ignored.
 es5id: 15.1.2.3_A6
 description: Complex test without eval
+includes: [decimalToHexString.js]
 ---*/
 
 //CHECK
@@ -54,27 +55,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}
diff --git a/test/built-ins/parseInt/S15.1.2.2_A8.js b/test/built-ins/parseInt/S15.1.2.2_A8.js
index 5aabbdedd8e2f544a7efac702f71c019b269c6c7..030c7b67d749429662ca0c0ef6c604bae54a8039 100644
--- a/test/built-ins/parseInt/S15.1.2.2_A8.js
+++ b/test/built-ins/parseInt/S15.1.2.2_A8.js
@@ -9,6 +9,7 @@ info: >
     characters were ignored.
 es5id: 15.1.2.2_A8
 description: Complex test without eval
+includes: [decimalToHexString.js]
 ---*/
 
 //CHECK
@@ -56,27 +57,3 @@ if (errorCount > 0) {
   }     
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' ');
 }
-
-function decimalToHexString(n) {
-  n = Number(n);
-  var h = "";
-  for (var i = 3; i >= 0; i--) {
-    if (n >= Math.pow(16, i)) {
-      var t = Math.floor(n / Math.pow(16, i));
-      n -= t * Math.pow(16, i);
-      if ( t >= 10 ) {
-        if ( t == 10 ) { h += "A"; }
-        if ( t == 11 ) { h += "B"; }
-        if ( t == 12 ) { h += "C"; }
-        if ( t == 13 ) { h += "D"; }
-        if ( t == 14 ) { h += "E"; }
-        if ( t == 15 ) { h += "F"; }
-      } else {
-        h += String(t);
-      }
-    } else {
-      h += "0";
-    }
-  }
-  return h;
-}