diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/next/return-promise.js b/test/built-ins/AsyncFromSyncIteratorPrototype/next/return-promise.js
index d3bb1be2f4d54a20c93461dbf76ca6d6c199b848..f4daeb01bceb4cd8ec048d7ff507c18ad149387a 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/next/return-promise.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/next/return-promise.js
@@ -12,7 +12,6 @@ info: |
   ...
   18. Return promiseCapability.[[Promise]].
 
-flags: [async]
 features: [async-iteration]
 ---*/
 
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/return/iterator-result-unwrap-promise.js b/test/built-ins/AsyncFromSyncIteratorPrototype/return/iterator-result-unwrap-promise.js
index 08ed58ec30870fe38e6112db815cb78a21b39e9c..311b93a8f62dbb9215891d3d27abf08031de42a6 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/return/iterator-result-unwrap-promise.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/return/iterator-result-unwrap-promise.js
@@ -60,4 +60,5 @@ iter.next().then(function (result) {
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
-}).then($DONE, $DONE);
+
+}).catch($DONE);
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-done.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-done.js
index 0bae74492ec7882e81246bb3ff4f4e2e16f2d891..7b6816a7cb46fb7092dc98c07e96c6a4da404e21 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-done.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-done.js
@@ -30,15 +30,15 @@ var obj = {
   [Symbol.iterator]() {
     return {
       next() {
-	return { value: 1, done: false };
+        return { value: 1, done: false };
       },
       throw() {
-	return {
-	  get done() {
-	    throw thrownError;
-	  },
-	  value: 1
-	}
+        return {
+          get done() {
+            throw thrownError;
+          },
+          value: 1
+        };
       }
     };
   }
@@ -60,8 +60,8 @@ iter.next().then(function(result) {
       assert.sameValue(err, thrownError, "Promise should be rejected with thrown error");
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-value.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-value.js
index a04f988a2dda6c40953011be29ac781593ab346d..2534905824a697782b6a5070e70bc3b327b28a45 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-value.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-poisoned-value.js
@@ -30,15 +30,15 @@ var obj = {
   [Symbol.iterator]() {
     return {
       next() {
-	return { value: 1, done: false };
+        return { value: 1, done: false };
       },
       throw() {
-	return {
-	  get value() {
-	    throw thrownError;
-	  },
-	  done: false
-	}
+        return {
+          get value() {
+            throw thrownError;
+          },
+          done: false
+        };
       }
     }
   }
@@ -60,8 +60,8 @@ iter.next().then(function(result) {
       assert.sameValue(err, thrownError, "Promise should be rejected with thrown error");
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-unwrap-promise.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-unwrap-promise.js
index 521f513111860f50fc7085b6309a8dbb05ff18a7..d7b04c5db7de26855f30e42e16d175bd77bdf2b5 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-unwrap-promise.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-unwrap-promise.js
@@ -33,13 +33,13 @@ var obj = {
   [Symbol.iterator]() {
     return {
       next() {
-	return { value: 1, done: false };
+        return { value: 1, done: false };
       },
       throw() {
-	return {
-	  value: Promise.resolve(42),
-	  done: true
-	};
+        return {
+          value: Promise.resolve(42),
+          done: true
+        };
       }
     };
   }
@@ -57,9 +57,9 @@ iter.next().then(function (result) {
       assert.sameValue(result.value, 42, "Result.value should be unwrapped, got: " + result.value);
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
-}).then($DONE, $DONE);
+}).catch($DONE);
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result.js
index 041ca20099a0c840b5b86009a448ddb9a8e9a06a..58475844f7e81c0ed671ab55fe3786ea2927e95a 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result.js
@@ -50,8 +50,8 @@ iter.next().then(function(result) {
       assert.sameValue(err, thrownError, "promise should be reject with custom error, got: " + err)
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-get-throw.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-get-throw.js
index 87609bebbb70c32fadd1d91214b6ecb198cf1cc1..d057a0ced9bfdff5d021891e9e1d26abc20e079c 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-get-throw.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-get-throw.js
@@ -24,12 +24,12 @@ var obj = {
   [Symbol.iterator]() {
     return {
       next() {
-	return { value: 1, done: false };
+        return { value: 1, done: false };
       },
       get throw() {
-	throw thrownError;
+        throw thrownError;
       }
-    }
+    };
   }
 };
 
@@ -49,11 +49,10 @@ iter.next().then(function(result) {
       assert.sameValue(err, thrownError, "Promise should be rejected with thrown error");
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
 
 }).catch($DONE);
-
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-throw.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-throw.js
index 25bfc5b2860940853f162e7928a3dbbcf56433c1..5625eb8e9e2a7ae8ce345936a5f32d2312b11de4 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-throw.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/poisoned-throw.js
@@ -27,10 +27,10 @@ var obj = {
   [Symbol.iterator]() {
     return {
       next() {
-	return { value: 1, done: false };
+        return { value: 1, done: false };
       },
       throw() {
-	throw thrownError;
+        throw thrownError;
       }
     };
   }
@@ -52,10 +52,9 @@ iter.next().then(function(result) {
       assert.sameValue(err, thrownError, "Promise should be rejected with thrown error");
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
-
 }).catch($DONE);
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/result-object-error.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/result-object-error.js
index 35e9f8336f4052c17e58d60163b21d8726387692..c25bd96dda027314fe5346240f62592592e6d60f 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/result-object-error.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/result-object-error.js
@@ -28,10 +28,10 @@ var obj = {
   [Symbol.iterator]() {
     return {
       next() {
-	return { value: 1, done: false };
+        return { value: 1, done: false };
       },
       throw() {
-	return 1;
+        return 1;
       }
     };
   }
@@ -54,8 +54,8 @@ iter.next().then(function(result) {
       assert(typeerror, "Expect TypeError, got: " + err);
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
diff --git a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/throw-undefined.js b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/throw-undefined.js
index 94863e2c5acccdef6781da2b96852775b7310833..6d0442628170b3e5f23e9f2a2ccd5f27ba877e72 100644
--- a/test/built-ins/AsyncFromSyncIteratorPrototype/throw/throw-undefined.js
+++ b/test/built-ins/AsyncFromSyncIteratorPrototype/throw/throw-undefined.js
@@ -23,7 +23,7 @@ var obj = {
   [Symbol.iterator]() {
     return {
       next() {
-	return { value: 1, done: false };
+        return { value: 1, done: false };
       }
     };
   }
@@ -36,7 +36,6 @@ async function* asyncg() {
 var iter = asyncg();
 
 iter.next().then(function(result) {
-
   iter.throw().then(
     function (result) {
       throw new Test262Error("Promise should be rejected, got: " + result.value);
@@ -45,11 +44,10 @@ iter.next().then(function(result) {
       assert.sameValue(err, undefined, "Promise should be rejected with undefined");
 
       iter.next().then(({ done, value }) => {
-	assert.sameValue(done, true, 'the iterator is completed');
-	assert.sameValue(value, undefined, 'value is undefined');
+        assert.sameValue(done, true, 'the iterator is completed');
+        assert.sameValue(value, undefined, 'value is undefined');
       }).then($DONE, $DONE);
     }
   ).catch($DONE);
 
 }).catch($DONE);
-
diff --git a/test/built-ins/TypedArrays/ctors/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js b/test/built-ins/TypedArrays/ctors/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js
index 1c916b43cdf332e338bc0280d50df49767b5dd67..3b59f0509134f211c8e39e3c92e9dcd2523f8387 100644
--- a/test/built-ins/TypedArrays/ctors/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js
+++ b/test/built-ins/TypedArrays/ctors/buffer-arg/bufferbyteoffset-throws-from-modulo-element-size.js
@@ -29,4 +29,4 @@ testWithTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(buffer, 0, undefined);
   });
-});
+}, [ Float64Array, Float32Array, Int32Array, Int16Array, Uint32Array, Uint16Array ]);
diff --git a/test/built-ins/TypedArrays/ctors/buffer-arg/byteoffset-throws-from-modulo-element-size.js b/test/built-ins/TypedArrays/ctors/buffer-arg/byteoffset-throws-from-modulo-element-size.js
index f495e6bcc00d874bb9c33302e37f837eb3d9ea93..53b6a707abfd61a9d1c4923a3f8a996f34d8a7a8 100644
--- a/test/built-ins/TypedArrays/ctors/buffer-arg/byteoffset-throws-from-modulo-element-size.js
+++ b/test/built-ins/TypedArrays/ctors/buffer-arg/byteoffset-throws-from-modulo-element-size.js
@@ -24,4 +24,4 @@ testWithTypedArrayConstructors(function(TA) {
   assert.throws(RangeError, function() {
     new TA(buffer, 7);
   });
-});
+}, [ Float64Array, Float32Array, Int32Array, Int16Array, Uint32Array, Uint16Array ]);