diff --git a/doc/api/fs.md b/doc/api/fs.md
index a4a9e5fd3f2..ae559d0ecff 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -2749,8 +2749,21 @@ changes:
 * `callback` {Function}
   * `err` {Error}
 
-Asynchronous unlink(2). No arguments other than a possible exception are given
-to the completion callback.
+Asynchronously removes a file or symbolic link. No arguments other than a
+possible exception are given to the completion callback.
+
+```js
+// Assuming that 'path/file.txt' is a regular file.
+fs.unlink('path/file.txt', (err) => {
+  if (err) throw err;
+  console.log('path/file.txt was deleted');
+});
+```
+
+`fs.unlink()` will not work on a directory, empty or otherwise. To remove a
+directory, use [`fs.rmdir()`][].
+
+See also: unlink(2)
 
 ## fs.unlinkSync(path)
 <!-- YAML
@@ -4472,6 +4485,7 @@ The following constants are meant for use with the [`fs.Stats`][] object's
 [`fs.read()`]: #fs_fs_read_fd_buffer_offset_length_position_callback
 [`fs.readFile()`]: #fs_fs_readfile_path_options_callback
 [`fs.readFileSync()`]: #fs_fs_readfilesync_path_options
+[`fs.rmdir()`]: #fs_fs_rmdir_path_callback
 [`fs.stat()`]: #fs_fs_stat_path_callback
 [`fs.utimes()`]: #fs_fs_utimes_path_atime_mtime_callback
 [`fs.watch()`]: #fs_fs_watch_filename_options_listener
diff --git a/doc/api/http.md b/doc/api/http.md
index 74ba9e8792c..daa058a8b0b 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -544,11 +544,16 @@ See [`request.socket`][]
 ### request.end([data[, encoding]][, callback])
 <!-- YAML
 added: v0.1.90
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/18780
+    description: This method now returns a reference to `ClientRequest`.
 -->
 
 * `data` {string|Buffer}
 * `encoding` {string}
 * `callback` {Function}
+* Returns: {this}
 
 Finishes sending the request. If any parts of the body are
 unsent, it will flush them to the stream. If the request is
@@ -1041,11 +1046,16 @@ See [`response.socket`][].
 ### response.end([data][, encoding][, callback])
 <!-- YAML
 added: v0.1.90
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/18780
+    description: This method now returns a reference to `ServerResponse`.
 -->
 
 * `data` {string|Buffer}
 * `encoding` {string}
 * `callback` {Function}
+* Returns: {this}
 
 This method signals to the server that all of the response headers and body
 have been sent; that server should consider this message complete.
diff --git a/doc/api/http2.md b/doc/api/http2.md
index 66cf7aafa0f..efacbe149b7 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -1718,7 +1718,7 @@ changes:
     Http2ServerRequest class to use.
     Useful for extending the original `Http2ServerRequest`.
     **Default:** `Http2ServerRequest`
-  * `Http2ServerResponse` {htt2.Http2ServerResponse} Specifies the
+  * `Http2ServerResponse` {http2.Http2ServerResponse} Specifies the
     Http2ServerResponse class to use.
     Useful for extending the original `Http2ServerResponse`.
     **Default:** `Http2ServerResponse`
@@ -2624,11 +2624,16 @@ See [`response.socket`][].
 #### response.end([data][, encoding][, callback])
 <!-- YAML
 added: v8.4.0
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/18780
+    description: This method now returns a reference to `ServerResponse`.
 -->
 
 * `data` {string|Buffer}
 * `encoding` {string}
 * `callback` {Function}
+* Returns: {this}
 
 This method signals to the server that all of the response headers and body
 have been sent; that server should consider this message complete.
diff --git a/doc/api/stream.md b/doc/api/stream.md
index 14be27cbf2d..c72873c466f 100644
--- a/doc/api/stream.md
+++ b/doc/api/stream.md
@@ -355,6 +355,9 @@ See also: [`writable.uncork()`][].
 <!-- YAML
 added: v0.9.4
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/18780
+    description: This method now returns a reference to `writable`.
   - version: v8.0.0
     pr-url: https://github.com/nodejs/node/pull/11608
     description: The `chunk` argument can now be a `Uint8Array` instance.
@@ -366,6 +369,7 @@ changes:
   other than `null`.
 * `encoding` {string} The encoding, if `chunk` is a string
 * `callback` {Function} Optional callback for when the stream is finished
+* Returns: {this}
 
 Calling the `writable.end()` method signals that no more data will be written
 to the [Writable][]. The optional `chunk` and `encoding` arguments allow one
diff --git a/doc/guides/contributing/pull-requests.md b/doc/guides/contributing/pull-requests.md
index 3d7c548bbd3..4fd2de923a0 100644
--- a/doc/guides/contributing/pull-requests.md
+++ b/doc/guides/contributing/pull-requests.md
@@ -660,4 +660,4 @@ you can take a look at the
 [guide for writing tests in Node.js]: ../writing-tests.md
 [https://ci.nodejs.org/]: https://ci.nodejs.org/
 [IRC in the #node-dev channel]: https://webchat.freenode.net?channels=node-dev&uio=d4
-[Onboarding guide]: ../onboarding.md
+[Onboarding guide]: ../../onboarding.md
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
index f513315b7cd..985b74679c0 100644
--- a/lib/_http_outgoing.js
+++ b/lib/_http_outgoing.js
@@ -736,7 +736,7 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
   }
 
   if (this.finished) {
-    return false;
+    return this;
   }
 
   var uncork;
@@ -766,12 +766,11 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
 
   var finish = onFinish.bind(undefined, this);
 
-  var ret;
   if (this._hasBody && this.chunkedEncoding) {
-    ret = this._send('0\r\n' + this._trailer + '\r\n', 'latin1', finish);
+    this._send('0\r\n' + this._trailer + '\r\n', 'latin1', finish);
   } else {
     // Force a flush, HACK.
-    ret = this._send('', 'latin1', finish);
+    this._send('', 'latin1', finish);
   }
 
   if (uncork)
@@ -788,7 +787,7 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
     this._finish();
   }
 
-  return ret;
+  return this;
 };
 
 
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index 3796bbc04e1..2b765881359 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -570,6 +570,8 @@ Writable.prototype.end = function(chunk, encoding, cb) {
   // ignore unnecessary end() calls.
   if (!state.ending)
     endWritable(this, state, cb);
+
+  return this;
 };
 
 Object.defineProperty(Writable.prototype, 'writableLength', {
diff --git a/lib/fs.js b/lib/fs.js
index 92e8d4fe3e2..0b17885329a 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -375,7 +375,7 @@ function readFileAfterStat(err) {
   // our internal use.
   var size;
   if ((statValues[1/*mode*/] & S_IFMT) === S_IFREG)
-    size = context.size = statValues[8/*size*/];
+    size = context.size = statValues[8];
   else
     size = context.size = 0;
 
@@ -490,7 +490,7 @@ fs.readFileSync = function(path, options) {
   // our internal use.
   var size;
   if ((statValues[1/*mode*/] & S_IFMT) === S_IFREG)
-    size = statValues[8/*size*/];
+    size = statValues[8];
   else
     size = 0;
   var pos = 0;
@@ -1654,8 +1654,8 @@ fs.realpathSync = function realpathSync(p, options) {
       var linkTarget = null;
       var id;
       if (!isWindows) {
-        var dev = statValues[0/*dev*/].toString(32);
-        var ino = statValues[7/*ino*/].toString(32);
+        var dev = statValues[0].toString(32);
+        var ino = statValues[7].toString(32);
         id = `${dev}:${ino}`;
         if (seenLinks[id]) {
           linkTarget = seenLinks[id];
@@ -1793,8 +1793,8 @@ fs.realpath = function realpath(p, options, callback) {
     // dev/ino always return 0 on windows, so skip the check.
     let id;
     if (!isWindows) {
-      var dev = statValues[0/*ino*/].toString(32);
-      var ino = statValues[7/*ino*/].toString(32);
+      var dev = statValues[0].toString(32);
+      var ino = statValues[7].toString(32);
       id = `${dev}:${ino}`;
       if (seenLinks[id]) {
         return gotTarget(null, seenLinks[id], base);
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
index 5e6c51377e9..9670843176b 100644
--- a/lib/internal/http2/compat.js
+++ b/lib/internal/http2/compat.js
@@ -596,6 +596,8 @@ class Http2ServerResponse extends Stream {
       this[kFinish]();
     else
       stream.end();
+
+    return this;
   }
 
   destroy(err) {
diff --git a/lib/internal/timers.js b/lib/internal/timers.js
index 0c140811f8c..8c1a87a65f4 100644
--- a/lib/internal/timers.js
+++ b/lib/internal/timers.js
@@ -24,6 +24,7 @@ module.exports = {
   async_id_symbol,
   trigger_async_id_symbol,
   Timeout,
+  initAsyncResource,
   refreshFnSymbol,
   setUnrefTimeout,
   validateTimerDuration
@@ -37,6 +38,14 @@ function getTimers() {
   return timers;
 }
 
+function initAsyncResource(resource, type) {
+  const asyncId = resource[async_id_symbol] = newAsyncId();
+  const triggerAsyncId =
+    resource[trigger_async_id_symbol] = getDefaultTriggerAsyncId();
+  if (initHooksExist())
+    emitInit(asyncId, type, triggerAsyncId, resource);
+}
+
 // Timer constructor function.
 // The entire prototype is defined in lib/timers.js
 function Timeout(callback, after, args, isRepeat, isUnrefed) {
@@ -66,14 +75,7 @@ function Timeout(callback, after, args, isRepeat, isUnrefed) {
 
   this[unrefedSymbol] = isUnrefed;
 
-  this[async_id_symbol] = newAsyncId();
-  this[trigger_async_id_symbol] = getDefaultTriggerAsyncId();
-  if (initHooksExist()) {
-    emitInit(this[async_id_symbol],
-             'Timeout',
-             this[trigger_async_id_symbol],
-             this);
-  }
+  initAsyncResource(this, 'Timeout');
 }
 
 Timeout.prototype[refreshFnSymbol] = function refresh() {
diff --git a/lib/timers.js b/lib/timers.js
index 145550b7b56..bc98718fdfa 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -30,6 +30,7 @@ const {
   async_id_symbol,
   trigger_async_id_symbol,
   Timeout,
+  initAsyncResource,
   validateTimerDuration
 } = require('internal/timers');
 const internalUtil = require('internal/util');
@@ -39,12 +40,8 @@ const util = require('util');
 const errors = require('internal/errors');
 const debug = util.debuglog('timer');
 const {
-  getDefaultTriggerAsyncId,
-  newAsyncId,
-  initHooksExist,
   destroyHooksExist,
   // The needed emit*() functions.
-  emitInit,
   emitBefore,
   emitAfter,
   emitDestroy
@@ -188,14 +185,7 @@ function insert(item, unrefed, start) {
 
   if (!item[async_id_symbol] || item._destroyed) {
     item._destroyed = false;
-    item[async_id_symbol] = newAsyncId();
-    item[trigger_async_id_symbol] = getDefaultTriggerAsyncId();
-    if (initHooksExist()) {
-      emitInit(item[async_id_symbol],
-               'Timeout',
-               item[trigger_async_id_symbol],
-               item);
-    }
+    initAsyncResource(item, 'Timeout');
   }
 
   L.append(list, item);
@@ -720,14 +710,7 @@ const Immediate = class Immediate {
     this._destroyed = false;
     this[kRefed] = false;
 
-    this[async_id_symbol] = newAsyncId();
-    this[trigger_async_id_symbol] = getDefaultTriggerAsyncId();
-    if (initHooksExist()) {
-      emitInit(this[async_id_symbol],
-               'Immediate',
-               this[trigger_async_id_symbol],
-               this);
-    }
+    initAsyncResource(this, 'Immediate');
 
     this.ref();
     immediateInfo[kCount]++;
diff --git a/node.gyp b/node.gyp
index 59de0fdd322..101ade1351e 100644
--- a/node.gyp
+++ b/node.gyp
@@ -966,7 +966,7 @@
       'type': 'executable',
 
       'dependencies': [
-        '<(node_core_target_name)',
+        '<(node_lib_target_name)',
         'rename_node_bin_win',
         'deps/gtest/gtest.gyp:gtest',
         'node_js2c#host',
@@ -975,39 +975,6 @@
         'node_dtrace_provider',
       ],
 
-      'variables': {
-        'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
-        'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
-        'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)/src/tracing',
-        'obj_suffix': 'o',
-        'obj_separator': '/',
-        'conditions': [
-          ['OS=="win"', {
-            'obj_suffix': 'obj',
-          }],
-          ['GENERATOR=="ninja"', {
-            'obj_path': '<(obj_dir)/src',
-            'obj_gen_path': '<(obj_dir)/gen',
-            'obj_tracing_path': '<(obj_dir)/src/tracing',
-            'obj_separator': '/<(node_lib_target_name).',
-          }, {
-            'conditions': [
-              ['OS=="win"', {
-                'obj_path': '<(obj_dir)/<(node_lib_target_name)',
-                'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)',
-                'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)',
-              }],
-              ['OS=="aix"', {
-                'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
-                'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
-                'obj_tracing_path':
-                  '<(obj_dir)/<(node_lib_target_name)/src/tracing',
-              }],
-            ]}
-          ]
-        ],
-       },
-
       'includes': [
         'node.gypi'
       ],
@@ -1023,7 +990,6 @@
       'defines': [ 'NODE_WANT_INTERNALS=1' ],
 
       'sources': [
-        'test/cctest/node_module_reg.cc',
         'test/cctest/node_test_fixture.cc',
         'test/cctest/test_aliased_buffer.cc',
         'test/cctest/test_base64.cc',
@@ -1032,29 +998,6 @@
         'test/cctest/test_util.cc',
         'test/cctest/test_url.cc'
       ],
-      'libraries': [
-        '<(obj_path)<(obj_separator)async_wrap.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)handle_wrap.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)env.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node_buffer.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node_debug_options.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node_i18n.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node_perf.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node_platform.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node_url.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)util.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)string_bytes.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)string_decoder.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)string_search.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)stream_base.<(obj_suffix)',
-        '<(obj_path)<(obj_separator)node_constants.<(obj_suffix)',
-        '<(obj_tracing_path)<(obj_separator)agent.<(obj_suffix)',
-        '<(obj_tracing_path)<(obj_separator)node_trace_buffer.<(obj_suffix)',
-        '<(obj_tracing_path)<(obj_separator)node_trace_writer.<(obj_suffix)',
-        '<(obj_tracing_path)<(obj_separator)trace_event.<(obj_suffix)',
-        '<(obj_gen_path)<(obj_separator)node_javascript.<(obj_suffix)',
-      ],
 
       'conditions': [
         [ 'node_engine=="v8"', {
@@ -1087,103 +1030,36 @@
         }],
 
         [ 'node_use_openssl=="true"', {
-          'conditions': [
-            ['node_target_type!="static_library"', {
-              'libraries': [
-                '<(obj_path)<(obj_separator)node_crypto.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)node_crypto_bio.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)node_crypto_clienthello.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)tls_wrap.<(obj_suffix)',
-              ],
-            }],
-          ],
-          'defines': [
-            'HAVE_OPENSSL=1',
-          ],
           'defines': [
             'HAVE_OPENSSL=1',
           ],
         }],
         [ 'node_use_perfctr=="true"', {
           'defines': [ 'HAVE_PERFCTR=1' ],
-          'libraries': [
-            '<(obj_path)<(obj_separator)node_counters.<(obj_suffix)',
-            '<(obj_path)<(obj_separator)'
-              'node_win32_perfctr_provider.<(obj_suffix)',
-          ],
         }],
         ['v8_enable_inspector==1', {
           'sources': [
             'test/cctest/test_inspector_socket.cc',
             'test/cctest/test_inspector_socket_server.cc'
           ],
-          'conditions': [
-            ['node_target_type!="static_library"', {
-              'libraries': [
-                '<(obj_path)<(obj_separator)inspector_agent.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)inspector_io.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)inspector_js_api.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)inspector_socket.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)inspector_socket_server.<(obj_suffix)',
-              ],
-            }],
-          ],
           'defines': [
             'HAVE_INSPECTOR=1',
           ],
-        }],
-        [ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
-          'libraries': [
-            '<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
-          ],
-          'conditions': [
-            ['OS!="mac" and OS!="linux"', {
-              'libraries': [
-                '<(obj_path)<(obj_separator)node_dtrace_provider.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)node_dtrace_ustack.<(obj_suffix)',
-              ]
-            }],
-            ['OS=="linux"', {
-              'libraries': [
-                '<(SHARED_INTERMEDIATE_DIR)<(obj_separator)'
-                  'node_dtrace_provider.<(obj_suffix)',
-              ]
-            }],
-          ],
         }, {
-          'conditions': [
-            [ 'node_use_etw=="true" and OS=="win"', {
-              'libraries': [
-                '<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
-                '<(obj_path)<(obj_separator)'
-                  'node_win32_etw_provider.<(obj_suffix)',
-              ],
-            }]
-          ]
+          'defines': [ 'HAVE_INSPECTOR=0' ]
         }],
         [ 'OS=="win" and node_target_type!="static_library"', {
-          'libraries': [
-            '<(obj_path)<(obj_separator)backtrace_win32.<(obj_suffix)',
-          ],
           'conditions': [
             # this is only necessary for chakra on windows because chakra is dynamically linked on windows
             [ 'node_engine=="chakracore"', {
               'libraries': [ '-ldbghelp.lib' ],
             }],
           ],
-        }, {
-          'conditions': [
-            ['node_target_type!="static_library"', {
-              'libraries': [
-                '<(obj_path)<(obj_separator)backtrace_posix.<(obj_suffix)',
-              ],
-            }],
-          ],
         }],
         ['OS=="solaris"', {
           'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
         }],
-      ]
+      ],
     }
   ], # end targets
 
diff --git a/src/node_file.cc b/src/node_file.cc
index d1be11c2573..5cc659c6c40 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -527,6 +527,7 @@ class fs_req_wrap {
   DISALLOW_COPY_AND_ASSIGN(fs_req_wrap);
 };
 
+// Returns nullptr if the operation fails from the start.
 template <typename Func, typename... Args>
 inline FSReqBase* AsyncDestCall(Environment* env,
     FSReqBase* req_wrap,
@@ -541,16 +542,16 @@ inline FSReqBase* AsyncDestCall(Environment* env,
     uv_fs_t* uv_req = req_wrap->req();
     uv_req->result = err;
     uv_req->path = nullptr;
-    after(uv_req);
+    after(uv_req);  // after may delete req_wrap if there is an error
     req_wrap = nullptr;
+  } else {
+    req_wrap->SetReturnValue(args);
   }
 
-  if (req_wrap != nullptr) {
-    args.GetReturnValue().Set(req_wrap->persistent());
-  }
   return req_wrap;
 }
 
+// Returns nullptr if the operation fails from the start.
 template <typename Func, typename... Args>
 inline FSReqBase* AsyncCall(Environment* env,
     FSReqBase* req_wrap,
@@ -629,7 +630,6 @@ void Access(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {  // access(path, mode, req)
     AsyncCall(env, req_wrap, args, "access", UTF8, AfterNoArgs,
               uv_fs_access, *path, mode);
-    req_wrap->SetReturnValue(args);
   } else {  // access(path, mode, undefined, ctx)
     CHECK_EQ(argc, 4);
     fs_req_wrap req_wrap;
@@ -651,7 +651,6 @@ void Close(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {  // close(fd, req)
     AsyncCall(env, req_wrap, args, "close", UTF8, AfterNoArgs,
               uv_fs_close, fd);
-    req_wrap->SetReturnValue(args);
   } else {  // close(fd, undefined, ctx)
     CHECK_EQ(argc, 3);
     fs_req_wrap req_wrap;
@@ -760,7 +759,6 @@ static void Stat(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {  // stat(path, req)
     AsyncCall(env, req_wrap, args, "stat", UTF8, AfterStat,
               uv_fs_stat, *path);
-    req_wrap->SetReturnValue(args);
   } else {  // stat(path, undefined, ctx)
     CHECK_EQ(argc, 3);
     fs_req_wrap req_wrap;
@@ -785,7 +783,6 @@ static void LStat(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {  // lstat(path, req)
     AsyncCall(env, req_wrap, args, "lstat", UTF8, AfterStat,
               uv_fs_lstat, *path);
-    req_wrap->SetReturnValue(args);
   } else {  // lstat(path, undefined, ctx)
     CHECK_EQ(argc, 3);
     fs_req_wrap req_wrap;
@@ -810,7 +807,6 @@ static void FStat(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {  // fstat(fd, req)
     AsyncCall(env, req_wrap, args, "fstat", UTF8, AfterStat,
               uv_fs_fstat, fd);
-    req_wrap->SetReturnValue(args);
   } else {  // fstat(fd, undefined, ctx)
     CHECK_EQ(argc, 3);
     fs_req_wrap req_wrap;
@@ -864,7 +860,6 @@ static void Link(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {  // link(src, dest, req)
     AsyncDestCall(env, req_wrap, args, "link", *dest, dest.length(), UTF8,
                   AfterNoArgs, uv_fs_link, *src, *dest);
-    req_wrap->SetReturnValue(args);
   } else {  // link(src, dest)
     CHECK_EQ(argc, 4);
     fs_req_wrap req;
@@ -888,7 +883,6 @@ static void ReadLink(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {  // readlink(path, encoding, req)
     AsyncCall(env, req_wrap, args, "readlink", encoding, AfterStringPtr,
               uv_fs_readlink, *path);
-    req_wrap->SetReturnValue(args);
   } else {
     CHECK_EQ(argc, 4);
     fs_req_wrap req;
@@ -929,7 +923,6 @@ static void Rename(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncDestCall(env, req_wrap, args, "rename", *new_path, new_path.length(),
                   UTF8, AfterNoArgs, uv_fs_rename, *old_path, *new_path);
-    req_wrap->SetReturnValue(args);
   } else {
     CHECK_EQ(argc, 4);
     fs_req_wrap req;
@@ -953,7 +946,6 @@ static void FTruncate(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "ftruncate", UTF8, AfterNoArgs,
               uv_fs_ftruncate, fd, len);
-    req_wrap->SetReturnValue(args);
   } else {
     CHECK_EQ(argc, 4);
     fs_req_wrap req;
@@ -974,7 +966,6 @@ static void Fdatasync(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "fdatasync", UTF8, AfterNoArgs,
               uv_fs_fdatasync, fd);
-    req_wrap->SetReturnValue(args);
   } else {
     CHECK_EQ(argc, 3);
     fs_req_wrap req;
@@ -995,7 +986,6 @@ static void Fsync(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "fsync", UTF8, AfterNoArgs,
               uv_fs_fsync, fd);
-    req_wrap->SetReturnValue(args);
   } else {
     CHECK_EQ(argc, 3);
     fs_req_wrap req;
@@ -1016,7 +1006,6 @@ static void Unlink(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "unlink", UTF8, AfterNoArgs,
               uv_fs_unlink, *path);
-    req_wrap->SetReturnValue(args);
   } else {
     CHECK_EQ(argc, 3);
     fs_req_wrap req;
@@ -1036,7 +1025,6 @@ static void RMDir(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "rmdir", UTF8, AfterNoArgs,
               uv_fs_rmdir, *path);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(rmdir, *path, *path)
   }
@@ -1057,7 +1045,6 @@ static void MKDir(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "mkdir", UTF8, AfterNoArgs,
               uv_fs_mkdir, *path, mode);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(mkdir, *path, *path, mode)
   }
@@ -1075,7 +1062,6 @@ static void RealPath(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "realpath", encoding, AfterStringPtr,
               uv_fs_realpath, *path);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(realpath, *path, *path);
     const char* link_path = static_cast<const char*>(SYNC_REQ.ptr);
@@ -1107,7 +1093,6 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "scandir", encoding, AfterScanDir,
               uv_fs_scandir, *path, 0 /*flags*/);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(scandir, *path, *path, 0 /*flags*/)
 
@@ -1178,7 +1163,6 @@ static void Open(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "open", UTF8, AfterInteger,
               uv_fs_open, *path, flags, mode);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(open, *path, *path, flags, mode)
     args.GetReturnValue().Set(SYNC_RESULT);
@@ -1203,7 +1187,6 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "open", UTF8, AfterOpenFileHandle,
               uv_fs_open, *path, flags, mode);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(open, *path, *path, flags, mode)
     HandleScope scope(env->isolate());
@@ -1228,7 +1211,6 @@ static void CopyFile(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "copyfile", UTF8, AfterNoArgs,
               uv_fs_copyfile, *src, *dest, flags);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_DEST_CALL(copyfile, *src, *dest, *src, *dest, flags)
   }
@@ -1271,7 +1253,7 @@ static void WriteBuffer(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "write", UTF8, AfterInteger,
               uv_fs_write, fd, &uvbuf, 1, pos);
-    return req_wrap->SetReturnValue(args);
+    return;
   }
 
   SYNC_CALL(write, nullptr, fd, &uvbuf, 1, pos)
@@ -1308,7 +1290,7 @@ static void WriteBuffers(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "write", UTF8, AfterInteger,
               uv_fs_write, fd, *iovs, iovs.length(), pos);
-    return req_wrap->SetReturnValue(args);
+    return;
   }
 
   SYNC_CALL(write, nullptr, fd, *iovs, iovs.length(), pos)
@@ -1376,7 +1358,6 @@ static void WriteString(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "write", UTF8, AfterInteger,
               uv_fs_write, fd, &uvbuf, 1, pos);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(write, nullptr, fd, &uvbuf, 1, pos)
     return args.GetReturnValue().Set(SYNC_RESULT);
@@ -1436,7 +1417,6 @@ static void Read(const FunctionCallbackInfo<Value>& args) {
 #endif
     AsyncCall(env, req_wrap, args, "read", UTF8, AfterInteger,
               uv_fs_read, fd, &uvbuf, 1, pos);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(read, 0, fd, &uvbuf, 1, pos)
     args.GetReturnValue().Set(SYNC_RESULT);
@@ -1467,7 +1447,6 @@ static void Chmod(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "chmod", UTF8, AfterNoArgs,
               uv_fs_chmod, *path, mode);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(chmod, *path, *path, mode);
   }
@@ -1490,7 +1469,6 @@ static void FChmod(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "fchmod", UTF8, AfterNoArgs,
               uv_fs_fchmod, fd, mode);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(fchmod, 0, fd, mode);
   }
@@ -1518,7 +1496,6 @@ static void Chown(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "chown", UTF8, AfterNoArgs,
               uv_fs_chown, *path, uid, gid);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(chown, *path, *path, uid, gid);
   }
@@ -1543,7 +1520,6 @@ static void FChown(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "fchown", UTF8, AfterNoArgs,
               uv_fs_fchown, fd, uid, gid);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(fchown, 0, fd, uid, gid);
   }
@@ -1567,7 +1543,6 @@ static void UTimes(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "utime", UTF8, AfterNoArgs,
               uv_fs_utime, *path, atime, mtime);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(utime, *path, *path, atime, mtime);
   }
@@ -1588,7 +1563,6 @@ static void FUTimes(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "futime", UTF8, AfterNoArgs,
               uv_fs_futime, fd, atime, mtime);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(futime, 0, fd, atime, mtime);
   }
@@ -1608,7 +1582,6 @@ static void Mkdtemp(const FunctionCallbackInfo<Value>& args) {
   if (req_wrap != nullptr) {
     AsyncCall(env, req_wrap, args, "mkdtemp", encoding, AfterStringPath,
               uv_fs_mkdtemp, *tmpl);
-    req_wrap->SetReturnValue(args);
   } else {
     SYNC_CALL(mkdtemp, *tmpl, *tmpl);
     const char* path = static_cast<const char*>(SYNC_REQ.path);
diff --git a/src/node_http2.h b/src/node_http2.h
index 0e81eaac6ca..217c19c0928 100644
--- a/src/node_http2.h
+++ b/src/node_http2.h
@@ -39,16 +39,20 @@ void inline debug_vfprintf(const char* format, ...) {
 #define DEBUG_HTTP2(...) debug_vfprintf(__VA_ARGS__);
 #define DEBUG_HTTP2SESSION(session, message)                                  \
   do {                                                                        \
-    DEBUG_HTTP2("Http2Session %s (%.0lf) " message "\n",                      \
-                   session->TypeName(),                                       \
-                   session->get_async_id());                                  \
+    if (session != nullptr) {                                                 \
+      DEBUG_HTTP2("Http2Session %s (%.0lf) " message "\n",                    \
+                  session->TypeName(),                                        \
+                  session->get_async_id());                                   \
+     }                                                                        \
   } while (0)
 #define DEBUG_HTTP2SESSION2(session, message, ...)                            \
   do {                                                                        \
-    DEBUG_HTTP2("Http2Session %s (%.0lf) " message "\n",                      \
-                   session->TypeName(),                                       \
-                   session->get_async_id(),                                   \
+    if (session != nullptr) {                                                 \
+      DEBUG_HTTP2("Http2Session %s (%.0lf) " message "\n",                    \
+                  session->TypeName(),                                        \
+                  session->get_async_id(),                                    \
                   __VA_ARGS__);                                               \
+    }                                                                         \
   } while (0)
 #define DEBUG_HTTP2STREAM(stream, message)                                    \
   do {                                                                        \
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index f2a84b83f32..a889279f6c6 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -491,8 +491,8 @@ bool TLSWrap::ClearIn() {
     // This can be skipped in the error case because no further writes
     // would succeed anyway.
     pending_cleartext_input_.insert(pending_cleartext_input_.end(),
-                                    &buffers[i],
-                                    &buffers[buffers.size()]);
+                                    buffers.begin() + i,
+                                    buffers.end());
   }
 
   return false;
diff --git a/test/cctest/node_module_reg.cc b/test/cctest/node_module_reg.cc
deleted file mode 100644
index bd4f20bc9f8..00000000000
--- a/test/cctest/node_module_reg.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Need to create empty definition for these modules'
-// registration function for cctest. Because when
-// building cctest, the definitions for the following
-// registration functions are not included.
-void _register_cares_wrap() {}
-void _register_config() {}
-void _register_contextify() {}
-void _register_domain() {}
-void _register_fs() {}
-void _register_fs_event_wrap() {}
-void _register_http2() {}
-void _register_http_parser() {}
-void _register_js_stream() {}
-void _register_module_wrap() {}
-void _register_os() {}
-void _register_pipe_wrap() {}
-void _register_process_wrap() {}
-void _register_serdes() {}
-void _register_signal_wrap() {}
-void _register_spawn_sync() {}
-void _register_stream_wrap() {}
-void _register_tcp_wrap() {}
-void _register_timer_wrap() {}
-void _register_trace_events() {}
-void _register_tty_wrap() {}
-void _register_udp_wrap() {}
-void _register_util() {}
-void _register_uv() {}
-void _register_v8() {}
-void _register_zlib() {}
diff --git a/test/cctest/test_node_postmortem_metadata.cc b/test/cctest/test_node_postmortem_metadata.cc
index be5cc7ce8ad..e901d97668f 100644
--- a/test/cctest/test_node_postmortem_metadata.cc
+++ b/test/cctest/test_node_postmortem_metadata.cc
@@ -1,5 +1,3 @@
-#include "node_postmortem_metadata.cc"
-
 #include "gtest/gtest.h"
 #include "node.h"
 #include "node_internals.h"
@@ -7,6 +5,28 @@
 #include "req_wrap-inl.h"
 #include "tracing/agent.h"
 #include "v8.h"
+#include "v8abbr.h"
+
+extern "C" {
+extern uintptr_t
+    nodedbg_offset_HandleWrap__handle_wrap_queue___ListNode_HandleWrap;
+extern uintptr_t
+    nodedbg_offset_Environment__handle_wrap_queue___Environment_HandleWrapQueue;
+extern int debug_symbols_generated;
+extern int nodedbg_const_Environment__kContextEmbedderDataIndex__int;
+extern uintptr_t
+    nodedbg_offset_Environment_HandleWrapQueue__head___ListNode_HandleWrap;
+extern uintptr_t
+    nodedbg_offset_Environment__req_wrap_queue___Environment_ReqWrapQueue;
+extern uintptr_t nodedbg_offset_ExternalString__data__uintptr_t;
+extern uintptr_t nodedbg_offset_ListNode_ReqWrap__next___uintptr_t;
+extern uintptr_t nodedbg_offset_ReqWrap__req_wrap_queue___ListNode_ReqWrapQueue;
+extern uintptr_t nodedbg_offset_ListNode_HandleWrap__next___uintptr_t;
+extern uintptr_t
+    nodedbg_offset_Environment_ReqWrapQueue__head___ListNode_ReqWrapQueue;
+extern uintptr_t
+    nodedbg_offset_BaseObject__persistent_handle___v8_Persistent_v8_Object;
+}
 
 
 class DebugSymbolsTest : public EnvironmentTestFixture {};
diff --git a/test/common/README.md b/test/common/README.md
index e0a66e9da0c..7fd36f59852 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -679,6 +679,12 @@ The realpath of the testing temporary directory.
 
 Deletes and recreates the testing temporary directory.
 
+### getTTYfd()
+
+Attempts to get a valid TTY file descriptor. Returns `-1` if it fails.
+
+The TTY file descriptor is assumed to be capable of being writable.
+
 ## WPT Module
 
 The wpt.js module is a port of parts of
diff --git a/test/common/index.js b/test/common/index.js
index 62adc15d505..6b977736223 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -801,6 +801,23 @@ exports.crashOnUnhandledRejection = function() {
              (err) => process.nextTick(() => { throw err; }));
 };
 
+exports.getTTYfd = function getTTYfd() {
+  // Do our best to grab a tty fd.
+  const tty = require('tty');
+  // Don't attempt fd 0 as it is not writable on Windows.
+  // Ref: ef2861961c3d9e9ed6972e1e84d969683b25cf95
+  const ttyFd = [1, 2, 4, 5].find(tty.isatty);
+  if (ttyFd === undefined) {
+    try {
+      return fs.openSync('/dev/tty');
+    } catch (e) {
+      // There aren't any tty fd's available to use.
+      return -1;
+    }
+  }
+  return ttyFd;
+};
+
 // Hijack stdout and stderr
 const stdWrite = {};
 function hijackStdWritable(name, listener) {
diff --git a/test/parallel/test-http-request-end-twice.js b/test/parallel/test-http-request-end-twice.js
index 525377d2e1c..47f08fd6e42 100644
--- a/test/parallel/test-http-request-end-twice.js
+++ b/test/parallel/test-http-request-end-twice.js
@@ -31,7 +31,7 @@ const server = http.Server(function(req, res) {
 server.listen(0, function() {
   const req = http.get({ port: this.address().port }, function(res) {
     res.on('end', function() {
-      assert.ok(!req.end());
+      assert.strictEqual(req.end(), req);
       server.close();
     });
     res.resume();
diff --git a/test/parallel/test-http-request-end.js b/test/parallel/test-http-request-end.js
index 6dd5fa4e91b..a0cdcf27dd0 100644
--- a/test/parallel/test-http-request-end.js
+++ b/test/parallel/test-http-request-end.js
@@ -44,7 +44,7 @@ const server = http.Server(function(req, res) {
 });
 
 server.listen(0, function() {
-  http.request({
+  const req = http.request({
     port: this.address().port,
     path: '/',
     method: 'POST'
@@ -54,5 +54,9 @@ server.listen(0, function() {
   }).on('error', function(e) {
     console.log(e.message);
     process.exit(1);
-  }).end(expected);
+  });
+
+  const result = req.end(expected);
+
+  assert.strictEqual(req, result);
 });
diff --git a/test/parallel/test-http2-client-destroy.js b/test/parallel/test-http2-client-destroy.js
index fab8a4fc24d..eab413e2327 100644
--- a/test/parallel/test-http2-client-destroy.js
+++ b/test/parallel/test-http2-client-destroy.js
@@ -59,7 +59,6 @@ const Countdown = require('../common/countdown');
       assert(socket.destroyed);
     }));
 
-
     const req = client.request();
     req.on('error', common.expectsError({
       code: 'ERR_HTTP2_STREAM_CANCEL',
@@ -77,15 +76,21 @@ const Countdown = require('../common/countdown');
       message: 'The session has been destroyed'
     };
 
-    common.expectsError(() => client.request(), sessionError);
+    common.expectsError(() => client.setNextStreamID(), sessionError);
+    common.expectsError(() => client.ping(), sessionError);
     common.expectsError(() => client.settings({}), sessionError);
+    common.expectsError(() => client.goaway(), sessionError);
+    common.expectsError(() => client.request(), sessionError);
     client.close();  // should be a non-op at this point
 
     // Wait for setImmediate call from destroy() to complete
     // so that state.destroyed is set to true
     setImmediate(() => {
-      common.expectsError(() => client.request(), sessionError);
+      common.expectsError(() => client.setNextStreamID(), sessionError);
+      common.expectsError(() => client.ping(), sessionError);
       common.expectsError(() => client.settings({}), sessionError);
+      common.expectsError(() => client.goaway(), sessionError);
+      common.expectsError(() => client.request(), sessionError);
       client.close();  // should be a non-op at this point
     });
 
diff --git a/test/parallel/test-http2-client-settings-before-connect.js b/test/parallel/test-http2-client-settings-before-connect.js
index 4642bf5220f..ceea1bc39ad 100644
--- a/test/parallel/test-http2-client-settings-before-connect.js
+++ b/test/parallel/test-http2-client-settings-before-connect.js
@@ -35,13 +35,26 @@ server.listen(0, common.mustCall(() => {
     ['enablePush', 0, TypeError],
     ['enablePush', null, TypeError],
     ['enablePush', {}, TypeError]
-  ].forEach((i) => {
+  ].forEach(([name, value, errorType]) =>
     common.expectsError(
-      () => client.settings({ [i[0]]: i[1] }),
+      () => client.settings({ [name]: value }),
       {
         code: 'ERR_HTTP2_INVALID_SETTING_VALUE',
-        type: i[2] });
-  });
+        type: errorType
+      }
+    )
+  );
+
+  [1, true, {}, []].forEach((invalidCallback) =>
+    common.expectsError(
+      () => client.settings({}, invalidCallback),
+      {
+        type: TypeError,
+        code: 'ERR_INVALID_CALLBACK',
+        message: 'Callback must be a function'
+      }
+    )
+  );
 
   client.settings({ maxFrameSize: 1234567 });
 
diff --git a/test/parallel/test-http2-compat-serverrequest-end.js b/test/parallel/test-http2-compat-serverrequest-end.js
index d3437211858..45a678d1a95 100644
--- a/test/parallel/test-http2-compat-serverrequest-end.js
+++ b/test/parallel/test-http2-compat-serverrequest-end.js
@@ -26,7 +26,7 @@ server.listen(0, common.mustCall(function() {
 
         server.close();
       }));
-      response.end();
+      assert.strictEqual(response.end(), response);
     }));
   }));
 
diff --git a/test/parallel/test-http2-ping.js b/test/parallel/test-http2-ping.js
index 32fb8926e47..0280f656d06 100644
--- a/test/parallel/test-http2-ping.js
+++ b/test/parallel/test-http2-ping.js
@@ -71,12 +71,60 @@ server.listen(0, common.mustCall(() => {
         assert.deepStrictEqual(payload, ret);
       })));
     }
+
     // Only max 2 pings at a time based on the maxOutstandingPings option
     assert(!client.ping(common.expectsError({
       code: 'ERR_HTTP2_PING_CANCEL',
       type: Error,
       message: 'HTTP2 ping cancelled'
     })));
+
+    // should throw if payload is not of type ArrayBufferView
+    {
+      [1, true, {}, []].forEach((invalidPayload) =>
+        common.expectsError(
+          () => client.ping(invalidPayload),
+          {
+            type: TypeError,
+            code: 'ERR_INVALID_ARG_TYPE',
+            message: 'The "payload" argument must be one of type' +
+                     ' Buffer, TypedArray, or DataView'
+          }
+        )
+      );
+    }
+
+    // should throw if payload length is not 8
+    {
+      const shortPayload = Buffer.from('abcdefg');
+      const longPayload = Buffer.from('abcdefghi');
+      [shortPayload, longPayload].forEach((payloadWithInvalidLength) =>
+        common.expectsError(
+          () => client.ping(payloadWithInvalidLength),
+          {
+            type: RangeError,
+            code: 'ERR_HTTP2_PING_LENGTH',
+            message: 'HTTP2 ping payload must be 8 bytes'
+          }
+        )
+      );
+    }
+
+    // should throw error is callback is not of type function
+    {
+      const payload = Buffer.from('abcdefgh');
+      [1, true, {}, []].forEach((invalidCallback) =>
+        common.expectsError(
+          () => client.ping(payload, invalidCallback),
+          {
+            type: TypeError,
+            code: 'ERR_INVALID_CALLBACK',
+            message: 'Callback must be a function'
+          }
+        )
+      );
+    }
+
     const req = client.request();
     req.resume();
     req.on('end', common.mustCall(() => {
diff --git a/test/parallel/test-stream-writableState-ending.js b/test/parallel/test-stream-writableState-ending.js
index 1e0b0bf77f1..ae2121f456e 100644
--- a/test/parallel/test-stream-writableState-ending.js
+++ b/test/parallel/test-stream-writableState-ending.js
@@ -24,11 +24,14 @@ writable.on('finish', () => {
   testStates(true, true, true);
 });
 
-writable.end('testing function end()', () => {
+const result = writable.end('testing function end()', () => {
   // ending, finished, ended = true.
   testStates(true, true, true);
 });
 
+// end returns the writable instance
+assert.strictEqual(result, writable);
+
 // ending, ended = true.
 // finished = false.
 testStates(true, false, true);
diff --git a/test/parallel/test-tty-get-color-depth.js b/test/parallel/test-tty-get-color-depth.js
deleted file mode 100644
index a4c7ffacd17..00000000000
--- a/test/parallel/test-tty-get-color-depth.js
+++ /dev/null
@@ -1,52 +0,0 @@
-'use strict';
-
-const common = require('../common');
-const assert = require('assert').strict;
-/* eslint-disable no-restricted-properties */
-const { openSync } = require('fs');
-const tty = require('tty');
-
-const { WriteStream } = require('tty');
-
-// Do our best to grab a tty fd.
-function getTTYfd() {
-  const ttyFd = [1, 2, 4, 5].find(tty.isatty);
-  if (ttyFd === undefined) {
-    try {
-      return openSync('/dev/tty');
-    } catch (e) {
-      // There aren't any tty fd's available to use.
-      return -1;
-    }
-  }
-  return ttyFd;
-}
-
-const fd = getTTYfd();
-
-// Give up if we did not find a tty
-if (fd === -1)
-  common.skip();
-
-const writeStream = new WriteStream(fd);
-
-let depth = writeStream.getColorDepth();
-
-assert.equal(typeof depth, 'number');
-assert(depth >= 1 && depth <= 24);
-
-// If the terminal does not support colors, skip the rest
-if (depth === 1)
-  common.skip();
-
-assert.notEqual(writeStream.getColorDepth({ TERM: 'dumb' }), depth);
-
-// Deactivate colors
-const tmp = process.env.NODE_DISABLE_COLORS;
-process.env.NODE_DISABLE_COLORS = 1;
-
-depth = writeStream.getColorDepth();
-
-assert.equal(depth, 1);
-
-process.env.NODE_DISABLE_COLORS = tmp;
diff --git a/test/pseudo-tty/test-tty-get-color-depth.js b/test/pseudo-tty/test-tty-get-color-depth.js
new file mode 100644
index 00000000000..7641290c057
--- /dev/null
+++ b/test/pseudo-tty/test-tty-get-color-depth.js
@@ -0,0 +1,36 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert').strict;
+/* eslint-disable no-restricted-properties */
+const { WriteStream } = require('tty');
+
+const fd = common.getTTYfd();
+const writeStream = new WriteStream(fd);
+
+{
+  const depth = writeStream.getColorDepth();
+
+  assert.equal(typeof depth, 'number');
+  assert(depth >= 1 && depth <= 24);
+
+  if (depth === 1) {
+    // Terminal does not support colors, compare to a value that would.
+    assert.notEqual(writeStream.getColorDepth({ COLORTERM: '1' }), depth);
+  } else {
+    // Terminal supports colors, compare to a value that would not.
+    assert.notEqual(writeStream.getColorDepth({ TERM: 'dumb' }), depth);
+  }
+}
+
+// Deactivate colors
+{
+  const tmp = process.env.NODE_DISABLE_COLORS;
+  process.env.NODE_DISABLE_COLORS = 1;
+
+  const depth = writeStream.getColorDepth();
+
+  assert.equal(depth, 1);
+
+  process.env.NODE_DISABLE_COLORS = tmp;
+}
diff --git a/test/pseudo-tty/test-tty-get-color-depth.out b/test/pseudo-tty/test-tty-get-color-depth.out
new file mode 100644
index 00000000000..e69de29bb2d