diff --git a/test/built-ins/Math/clz32/Math.clz32.js b/test/built-ins/Math/clz32/Math.clz32.js
index 0be6a84e645c022b3aadeab78374566191438cf6..f30b3a995b063e5b950120364074e91834074fdd 100644
--- a/test/built-ins/Math/clz32/Math.clz32.js
+++ b/test/built-ins/Math/clz32/Math.clz32.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.11
 author: Ryan Lewis
 description: Math.clz32 should return 32 if passed 0.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.clz32(0) === 32) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.clz32(0), 32, 'Math.clz32(0)');
diff --git a/test/built-ins/Math/clz32/Math.clz32_1.js b/test/built-ins/Math/clz32/Math.clz32_1.js
index 77a06c3bd9ee0bd25e7659c0c8b8e9e60ae895f3..3b571a737dc2af344139726465c8cb5517aacb87 100644
--- a/test/built-ins/Math/clz32/Math.clz32_1.js
+++ b/test/built-ins/Math/clz32/Math.clz32_1.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.11
 author: Ryan Lewis
 description: Math.clz32 should return 31 if passed 1.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.clz32(1) === 31) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.clz32(1), 31, 'Math.clz32(1)');
diff --git a/test/built-ins/Math/clz32/Math.clz32_2.js b/test/built-ins/Math/clz32/Math.clz32_2.js
index 29859bc2f342eb30c27131b3a3588fd845c41399..65c65deac365a0fb6c6be519a9e20beb2be8fb3f 100644
--- a/test/built-ins/Math/clz32/Math.clz32_2.js
+++ b/test/built-ins/Math/clz32/Math.clz32_2.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.11
 author: Ryan Lewis
 description: Math.clz32 should return 0 if passed 2147483648
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.clz32(2147483648) === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.clz32(2147483648), 0, 'Math.clz32(2147483648)');
diff --git a/test/built-ins/Math/fround/Math.fround_Infinity.js b/test/built-ins/Math/fround/Math.fround_Infinity.js
index b4f513796ad3c7382d401b670bb8fde16ca090fc..b59e40873b0d1acefd782544d38281322ee7269a 100644
--- a/test/built-ins/Math/fround/Math.fround_Infinity.js
+++ b/test/built-ins/Math/fround/Math.fround_Infinity.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.17
 author: Ryan Lewis
 description: Math.fround should return Infinity if called with Infinity.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.fround(Infinity) === Infinity) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.fround(Infinity), Infinity, 'Math.fround(Infinity)');
diff --git a/test/built-ins/Math/fround/Math.fround_NaN.js b/test/built-ins/Math/fround/Math.fround_NaN.js
index b266b1f2e70247fc7e0b50b880bc370c9397d63a..6023333373c64603e981ba7faa4aedad0482e4db 100644
--- a/test/built-ins/Math/fround/Math.fround_NaN.js
+++ b/test/built-ins/Math/fround/Math.fround_NaN.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.17
 author: Ryan Lewis
 description: Math.fround should return NaN if called with NaN.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isNaN(Math.fround(NaN))) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert(Number.isNaN(Math.fround(NaN)), 'Number.isNaN(Math.fround(NaN)) !== true');
diff --git a/test/built-ins/Math/fround/Math.fround_Zero.js b/test/built-ins/Math/fround/Math.fround_Zero.js
index a9d358017e84c148734d43252b6652a693b8622e..b6864fe4216d67244d464af2e2365b4806d89fd7 100644
--- a/test/built-ins/Math/fround/Math.fround_Zero.js
+++ b/test/built-ins/Math/fround/Math.fround_Zero.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.17
 author: Ryan Lewis
 description: Math.fround should return 0 if called with 0.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.fround(0) === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.fround(0), 0, 'Math.fround(0)');
diff --git a/test/built-ins/Math/hypot/Math.hypot_Infinity.js b/test/built-ins/Math/hypot/Math.hypot_Infinity.js
index 4457cdd8219b2fdb1a970f6d7e4e73e4611f68f7..f20b98fe7e5bc0cc887550a5db39ebc483d89a02 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Infinity.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Infinity.js
@@ -7,12 +7,6 @@ author: Ryan Lewis
 description: >
     Math.hypot should return Infinity if called with any argument that
     is Infinity.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.hypot(3, Infinity) === Infinity) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot(3, Infinity), Infinity, 'Math.hypot(3, Infinity)');
diff --git a/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js b/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js
index 798186153bd1a6ff4aa3b51531aa26a95ffe759c..f87c222f747e80a65d0eb1b8f3d2df98ee2b4a2f 100644
--- a/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js
+++ b/test/built-ins/Math/hypot/Math.hypot_InfinityNaN.js
@@ -7,12 +7,6 @@ author: Ryan Lewis
 description: >
     Math.hypot should return Infinity if called with any argument that
     is Infinity.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.hypot(NaN, Infinity) === Infinity) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot(NaN, Infinity), Infinity, 'Math.hypot(NaN, Infinity)');
diff --git a/test/built-ins/Math/hypot/Math.hypot_NaN.js b/test/built-ins/Math/hypot/Math.hypot_NaN.js
index f69404e3d27527a248f555318df840c1577eaf02..0f29e79ae75595e2f48a43de2c73fe4d9f5f0722 100644
--- a/test/built-ins/Math/hypot/Math.hypot_NaN.js
+++ b/test/built-ins/Math/hypot/Math.hypot_NaN.js
@@ -7,12 +7,6 @@ author: Ryan Lewis
 description: >
     Math.hypot should return NaN if called with any argument that is
     NaN.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isNaN(Math.hypot(NaN, 3))) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert(Number.isNaN(Math.hypot(NaN, 3)), 'Number.isNaN(Math.hypot(NaN, 3)) !== true');
diff --git a/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js b/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js
index 14c3fb534b3a00f42f423f0d10b511dff6f82e95..c28083db02dfa01022f0d624a4113c39dfffc57f 100644
--- a/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js
+++ b/test/built-ins/Math/hypot/Math.hypot_NegInfinity.js
@@ -7,12 +7,6 @@ author: Ryan Lewis
 description: >
     Math.hypot should return Infinity if called with any argument that
     is -Infinity.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.hypot(3, -Infinity) === Infinity) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot(3, -Infinity), Infinity, 'Math.hypot(3, -Infinity)');
diff --git a/test/built-ins/Math/hypot/Math.hypot_NoArgs.js b/test/built-ins/Math/hypot/Math.hypot_NoArgs.js
index 75a4b1ca5ef4e0ca96efbb223cb2a51f4bbc674a..164a9aa38fe04a3698530ffcc7161a6c3e95199e 100644
--- a/test/built-ins/Math/hypot/Math.hypot_NoArgs.js
+++ b/test/built-ins/Math/hypot/Math.hypot_NoArgs.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 0 if called with no arguments.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-   if(Math.hypot() === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot(), 0, 'Math.hypot()');
diff --git a/test/built-ins/Math/hypot/Math.hypot_Success.js b/test/built-ins/Math/hypot/Math.hypot_Success.js
index e341b053b773123d44f12c9c788f0e7e6358c22f..02d7fc7e38dfef444fa271b5b552bf0eb080205b 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Success.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Success.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 4 if called with 3 and 2.6457513110645907.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-   if(Math.hypot(3,2.6457513110645907) === 4) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot(3,2.6457513110645907), 4, 'Math.hypot(3,2.6457513110645907)');
diff --git a/test/built-ins/Math/hypot/Math.hypot_Success_2.js b/test/built-ins/Math/hypot/Math.hypot_Success_2.js
index d7354b5d45c4ae67691410d13e4dd24a0e4ce482..4106a0a7779ed8929df84d083d39d240f923f598 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Success_2.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Success_2.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 5 if called with 3 and 4.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.hypot(3,4) === 5) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot(3,4), 5, 'Math.hypot(3,4)');
diff --git a/test/built-ins/Math/hypot/Math.hypot_Zero_2.js b/test/built-ins/Math/hypot/Math.hypot_Zero_2.js
index 75a5d1c8321a1eb323174b27046a065464769e12..0a33737cbe6e05c032a90e78d5d3c6b8216d9fd9 100644
--- a/test/built-ins/Math/hypot/Math.hypot_Zero_2.js
+++ b/test/built-ins/Math/hypot/Math.hypot_Zero_2.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot should return 0 if called with all arguments being 0.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.hypot(0, 0) === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot(0, 0), 0, 'Math.hypot(0, 0)');
diff --git a/test/built-ins/Math/hypot/Math.hypot_lengthProp.js b/test/built-ins/Math/hypot/Math.hypot_lengthProp.js
index d213617a22c97fd4c9e2045c4e2480d34ab15a47..1bafa47549f970ce71866dcbda8a561d8ada4ca2 100644
--- a/test/built-ins/Math/hypot/Math.hypot_lengthProp.js
+++ b/test/built-ins/Math/hypot/Math.hypot_lengthProp.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.18
 author: Ryan Lewis
 description: Math.hypot.length should return 2.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.hypot.length === 2) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.hypot.length, 2, 'Math.hypot.length');
diff --git a/test/built-ins/Math/trunc/Math.trunc_Infinity.js b/test/built-ins/Math/trunc/Math.trunc_Infinity.js
index 6d5f8fe91894c2124ce317eb49425a2b347c6021..6a9abb4272a05c8c2325da777200d06dd919fb9c 100644
--- a/test/built-ins/Math/trunc/Math.trunc_Infinity.js
+++ b/test/built-ins/Math/trunc/Math.trunc_Infinity.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return Infinity when called with Infinity.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.trunc(.9) === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.trunc(.9), 0, 'Math.trunc(.9)');
diff --git a/test/built-ins/Math/trunc/Math.trunc_NaN.js b/test/built-ins/Math/trunc/Math.trunc_NaN.js
index e7793128beae0d4b7b8272375263d63cb62c3734..485b532177af533316228c10be34b115811357ee 100644
--- a/test/built-ins/Math/trunc/Math.trunc_NaN.js
+++ b/test/built-ins/Math/trunc/Math.trunc_NaN.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return NaN when called with NaN.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isNaN(Math.trunc(NaN))) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert(Number.isNaN(Math.trunc(NaN)), 'Number.isNaN(Math.trunc(NaN)) !== true');
diff --git a/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js b/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js
index 59b5e9ee15c0d9ee6518cacc23160012488c15c7..3c543e3293e5e4d4e63152f66b29640f30b48e3d 100644
--- a/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js
+++ b/test/built-ins/Math/trunc/Math.trunc_NegDecimal.js
@@ -4,13 +4,7 @@
 /*---
 es6id: 20.2.2.35
 author: Ryan Lewis
-description: Math.trunc should return 0 if called with a value between 0 and -1.
-includes: [runTestCase.js]
+description: Math.trunc should return -0 if called with a value between 0 and -1.
 ---*/
 
-function testcase() {
-  if(Math.trunc(-.9) === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.trunc(-.9), -0, 'Math.trunc(-.9)');
diff --git a/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js b/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js
index 537bdd5af79219bcd19b9cf2d8baf1118b696b16..5efecccccdba05b931a055544412d9d49dbd7327 100644
--- a/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js
+++ b/test/built-ins/Math/trunc/Math.trunc_PosDecimal.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return 0 if called with a value between 0 and 1.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.trunc(.9) === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.trunc(.9), 0, 'Math.trunc(.9)');
diff --git a/test/built-ins/Math/trunc/Math.trunc_Success.js b/test/built-ins/Math/trunc/Math.trunc_Success.js
index ba7525175500182975d6a2442ffb8e34933a16c1..f035290e4c07f34baef47e8886405eb83ba4e20c 100644
--- a/test/built-ins/Math/trunc/Math.trunc_Success.js
+++ b/test/built-ins/Math/trunc/Math.trunc_Success.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return 4578 if called with 4578.584949
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.trunc(4578.584949) === 4578) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.trunc(4578.584949), 4578, 'Math.trunc(4578.584949)');
diff --git a/test/built-ins/Math/trunc/Math.trunc_Zero.js b/test/built-ins/Math/trunc/Math.trunc_Zero.js
index 847046863bb8b71d9983aa467d7ab087ebb05ad1..3101668f44a2987e8c09a4aa42fe1b662f7de615 100644
--- a/test/built-ins/Math/trunc/Math.trunc_Zero.js
+++ b/test/built-ins/Math/trunc/Math.trunc_Zero.js
@@ -5,12 +5,6 @@
 es6id: 20.2.2.35
 author: Ryan Lewis
 description: Math.trunc should return 0 when called with 0.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Math.trunc(0) === 0) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Math.trunc(0), 0, 'Math.trunc(0)');