test: improve test conventions

Specifically, functions that are run in the context of the test runner
are put in module `test/testutil.lua` while the functions that are run
in the context of the test session are put in
`test/functional/testnvim.lua`.

Closes https://github.com/neovim/neovim/issues/27004.

40 files changed, 321 insertions, 257 deletions

diff --git a/test/functional/ex_cmds/append_spec.lua b/test/functional/ex_cmds/append_spec.lua
index 4d50bfb5a1..80fdcb3134 100644
--- a/test/functional/ex_cmds/append_spec.lua
+++ b/test/functional/ex_cmds/append_spec.lua
@@ -1,14 +1,15 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+local Screen = require('test.functional.ui.screen')
 
 local eq = t.eq
 local dedent = t.dedent
-local exec = t.exec
-local feed = t.feed
-local clear = t.clear
-local fn = t.fn
-local command = t.command
-local api = t.api
-local Screen = require('test.functional.ui.screen')
+local exec = n.exec
+local feed = n.feed
+local clear = n.clear
+local fn = n.fn
+local command = n.command
+local api = n.api
 
 local cmdtest = function(cmd, prep, ret1)
   describe(':' .. cmd, function()
diff --git a/test/functional/ex_cmds/arg_spec.lua b/test/functional/ex_cmds/arg_spec.lua
index 71a2f4ed77..9b89823dcc 100644
--- a/test/functional/ex_cmds/arg_spec.lua
+++ b/test/functional/ex_cmds/arg_spec.lua
@@ -1,8 +1,10 @@
-local t = require('test.functional.testutil')()
-local eq, command, fn = t.eq, t.command, t.fn
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local eq, command, fn = t.eq, n.command, n.fn
 local ok = t.ok
 local matches = t.matches
-local clear = t.clear
+local clear = n.clear
 
 describe(':argument', function()
   before_each(function()
@@ -11,19 +13,19 @@ describe(':argument', function()
 
   it('does not restart :terminal buffer', function()
     command('terminal')
-    t.feed([[<C-\><C-N>]])
+    n.feed([[<C-\><C-N>]])
     command('argadd')
-    t.feed([[<C-\><C-N>]])
+    n.feed([[<C-\><C-N>]])
     local bufname_before = fn.bufname('%')
     local bufnr_before = fn.bufnr('%')
     matches('^term://', bufname_before) -- sanity
 
     command('argument 1')
-    t.feed([[<C-\><C-N>]])
+    n.feed([[<C-\><C-N>]])
 
     local bufname_after = fn.bufname('%')
     local bufnr_after = fn.bufnr('%')
-    eq('[' .. bufname_before .. ']', t.eval('trim(execute("args"))'))
+    eq('[' .. bufname_before .. ']', n.eval('trim(execute("args"))'))
     ok(fn.line('$') > 1)
     eq(bufname_before, bufname_after)
     eq(bufnr_before, bufnr_after)
diff --git a/test/functional/ex_cmds/cd_spec.lua b/test/functional/ex_cmds/cd_spec.lua
index 7568d6c935..0f95f2aca4 100644
--- a/test/functional/ex_cmds/cd_spec.lua
+++ b/test/functional/ex_cmds/cd_spec.lua
@@ -1,13 +1,14 @@
 -- Specs for :cd, :tcd, :lcd and getcwd()
 
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local eq = t.eq
-local call = t.call
-local clear = t.clear
-local command = t.command
-local exc_exec = t.exc_exec
-local pathsep = t.get_pathsep()
+local call = n.call
+local clear = n.clear
+local command = n.command
+local exc_exec = n.exc_exec
+local pathsep = n.get_pathsep()
 local skip = t.skip
 local is_os = t.is_os
 local mkdir = t.mkdir
@@ -289,14 +290,14 @@ describe('getcwd()', function()
   end)
 
   after_each(function()
-    t.rmdir(directories.global)
+    n.rmdir(directories.global)
   end)
 
   it('returns empty string if working directory does not exist', function()
     skip(is_os('win'))
     command('cd ' .. directories.global)
     command("call delete('../" .. directories.global .. "', 'd')")
-    eq('', t.eval('getcwd()'))
+    eq('', n.eval('getcwd()'))
   end)
 
   it("works with 'autochdir' after local directory was set (#9892)", function()
diff --git a/test/functional/ex_cmds/cmd_map_spec.lua b/test/functional/ex_cmds/cmd_map_spec.lua
index e77d213ea3..6c1ac8eae5 100644
--- a/test/functional/ex_cmds/cmd_map_spec.lua
+++ b/test/functional/ex_cmds/cmd_map_spec.lua
@@ -1,15 +1,17 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local feed = t.feed
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+local Screen = require('test.functional.ui.screen')
+
+local clear = n.clear
+local feed = n.feed
 local eq = t.eq
-local expect = t.expect
-local eval = t.eval
-local fn = t.fn
-local insert = t.insert
+local expect = n.expect
+local eval = n.eval
+local fn = n.fn
+local insert = n.insert
 local write_file = t.write_file
-local exc_exec = t.exc_exec
-local command = t.command
-local Screen = require('test.functional.ui.screen')
+local exc_exec = n.exc_exec
+local command = n.command
 
 describe('mappings with <Cmd>', function()
   local screen
diff --git a/test/functional/ex_cmds/debug_spec.lua b/test/functional/ex_cmds/debug_spec.lua
index b0da98a87d..ebb3cdd38a 100644
--- a/test/functional/ex_cmds/debug_spec.lua
+++ b/test/functional/ex_cmds/debug_spec.lua
@@ -1,7 +1,8 @@
-local t = require('test.functional.testutil')()
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local feed = t.feed
-local clear = t.clear
+
+local feed = n.feed
+local clear = n.clear
 
 describe(':debug', function()
   local screen
diff --git a/test/functional/ex_cmds/dict_notifications_spec.lua b/test/functional/ex_cmds/dict_notifications_spec.lua
index 23aeb4ee9d..b6068a86db 100644
--- a/test/functional/ex_cmds/dict_notifications_spec.lua
+++ b/test/functional/ex_cmds/dict_notifications_spec.lua
@@ -1,13 +1,15 @@
-local t = require('test.functional.testutil')()
-local assert_alive = t.assert_alive
-local clear, source = t.clear, t.source
-local api = t.api
-local insert = t.insert
-local eq, next_msg = t.eq, t.next_msg
-local exc_exec = t.exc_exec
-local exec_lua = t.exec_lua
-local command = t.command
-local eval = t.eval
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local assert_alive = n.assert_alive
+local clear, source = n.clear, n.source
+local api = n.api
+local insert = n.insert
+local eq, next_msg = t.eq, n.next_msg
+local exc_exec = n.exc_exec
+local exec_lua = n.exec_lua
+local command = n.command
+local eval = n.eval
 
 describe('Vimscript dictionary notifications', function()
   local channel
diff --git a/test/functional/ex_cmds/digraphs_spec.lua b/test/functional/ex_cmds/digraphs_spec.lua
index ec83db9a84..fde25c028f 100644
--- a/test/functional/ex_cmds/digraphs_spec.lua
+++ b/test/functional/ex_cmds/digraphs_spec.lua
@@ -1,9 +1,10 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local command = t.command
-local feed = t.feed
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
+local clear = n.clear
+local command = n.command
+local feed = n.feed
+
 describe(':digraphs', function()
   local screen
   before_each(function()
diff --git a/test/functional/ex_cmds/drop_spec.lua b/test/functional/ex_cmds/drop_spec.lua
index 6b875270c8..54ddd79a35 100644
--- a/test/functional/ex_cmds/drop_spec.lua
+++ b/test/functional/ex_cmds/drop_spec.lua
@@ -1,8 +1,9 @@
-local t = require('test.functional.testutil')()
-local command = t.command
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local clear, feed, feed_command = t.clear, t.feed, t.feed_command
-local exec = t.exec
+
+local command = n.command
+local clear, feed, feed_command = n.clear, n.feed, n.feed_command
+local exec = n.exec
 
 describe(':drop', function()
   local screen
diff --git a/test/functional/ex_cmds/echo_spec.lua b/test/functional/ex_cmds/echo_spec.lua
index 3b523d2c98..2f0bcb4d9d 100644
--- a/test/functional/ex_cmds/echo_spec.lua
+++ b/test/functional/ex_cmds/echo_spec.lua
@@ -1,16 +1,17 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local eq = t.eq
 local NIL = vim.NIL
-local eval = t.eval
-local clear = t.clear
-local api = t.api
-local fn = t.fn
-local source = t.source
+local eval = n.eval
+local clear = n.clear
+local api = n.api
+local fn = n.fn
+local source = n.source
 local dedent = t.dedent
-local command = t.command
-local exc_exec = t.exc_exec
-local exec_capture = t.exec_capture
+local command = n.command
+local exc_exec = n.exc_exec
+local exec_capture = n.exec_capture
 local matches = t.matches
 
 describe(':echo :echon :echomsg :echoerr', function()
@@ -349,8 +350,8 @@ describe(':echo :echon :echomsg :echoerr', function()
   end)
 
   describe('used to represent special values', function()
-    local function chr(n)
-      return ('%c'):format(n)
+    local function chr(_n)
+      return ('%c'):format(_n)
     end
     local function ctrl(c)
       return ('%c'):format(c:upper():byte() - 0x40)
diff --git a/test/functional/ex_cmds/edit_spec.lua b/test/functional/ex_cmds/edit_spec.lua
index c51b860aeb..39849a202f 100644
--- a/test/functional/ex_cmds/edit_spec.lua
+++ b/test/functional/ex_cmds/edit_spec.lua
@@ -1,9 +1,11 @@
-local t = require('test.functional.testutil')()
-local eq, command, fn = t.eq, t.command, t.fn
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local eq, command, fn = t.eq, n.command, n.fn
 local ok = t.ok
 local matches = t.matches
-local clear = t.clear
-local feed = t.feed
+local clear = n.clear
+local feed = n.feed
 
 describe(':edit', function()
   before_each(function()
diff --git a/test/functional/ex_cmds/encoding_spec.lua b/test/functional/ex_cmds/encoding_spec.lua
index 520ed6fff6..6b882253b9 100644
--- a/test/functional/ex_cmds/encoding_spec.lua
+++ b/test/functional/ex_cmds/encoding_spec.lua
@@ -1,6 +1,8 @@
-local t = require('test.functional.testutil')()
-local clear, feed_command, feed = t.clear, t.feed_command, t.feed
-local eq, neq, eval = t.eq, t.neq, t.eval
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, feed_command, feed = n.clear, n.feed_command, n.feed
+local eq, neq, eval = t.eq, t.neq, n.eval
 
 describe('&encoding', function()
   before_each(function()
diff --git a/test/functional/ex_cmds/excmd_spec.lua b/test/functional/ex_cmds/excmd_spec.lua
index cb277263c7..20ebb2dedb 100644
--- a/test/functional/ex_cmds/excmd_spec.lua
+++ b/test/functional/ex_cmds/excmd_spec.lua
@@ -1,10 +1,12 @@
-local t = require('test.functional.testutil')()
-local command = t.command
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local command = n.command
 local eq = t.eq
-local clear = t.clear
-local fn = t.fn
+local clear = n.clear
+local fn = n.fn
 local pcall_err = t.pcall_err
-local assert_alive = t.assert_alive
+local assert_alive = n.assert_alive
 
 describe('Ex cmds', function()
   before_each(function()
diff --git a/test/functional/ex_cmds/file_spec.lua b/test/functional/ex_cmds/file_spec.lua
index 654d96cb77..0c51f1c17b 100644
--- a/test/functional/ex_cmds/file_spec.lua
+++ b/test/functional/ex_cmds/file_spec.lua
@@ -1,9 +1,11 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local command = t.command
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
+local command = n.command
 local eq = t.eq
-local fn = t.fn
-local rmdir = t.rmdir
+local fn = n.fn
+local rmdir = n.rmdir
 local mkdir = t.mkdir
 
 describe(':file', function()
diff --git a/test/functional/ex_cmds/grep_spec.lua b/test/functional/ex_cmds/grep_spec.lua
index 328064ed3c..f7d0f43c62 100644
--- a/test/functional/ex_cmds/grep_spec.lua
+++ b/test/functional/ex_cmds/grep_spec.lua
@@ -1,5 +1,7 @@
-local t = require('test.functional.testutil')()
-local clear, feed_command, feed, ok, eval = t.clear, t.feed_command, t.feed, t.ok, t.eval
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, feed_command, feed, ok, eval = n.clear, n.feed_command, n.feed, t.ok, n.eval
 
 describe(':grep', function()
   before_each(clear)
diff --git a/test/functional/ex_cmds/help_spec.lua b/test/functional/ex_cmds/help_spec.lua
index 9a86b2b345..f0a7bea7e4 100644
--- a/test/functional/ex_cmds/help_spec.lua
+++ b/test/functional/ex_cmds/help_spec.lua
@@ -1,19 +1,20 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
-local clear = t.clear
-local command = t.command
+local clear = n.clear
+local command = n.command
 local eq = t.eq
-local fn = t.fn
-local api = t.api
+local fn = n.fn
+local api = n.api
 local mkdir = t.mkdir
-local rmdir = t.rmdir
+local rmdir = n.rmdir
 local write_file = t.write_file
 
 describe(':help', function()
   before_each(clear)
 
   it('window closed makes cursor return to a valid win/buf #9773', function()
-    t.add_builddir_to_rtp()
+    n.add_builddir_to_rtp()
     command('help help')
     eq(1001, fn.win_getid())
     command('quit')
diff --git a/test/functional/ex_cmds/highlight_spec.lua b/test/functional/ex_cmds/highlight_spec.lua
index a34e9c1659..3cb6cc2579 100644
--- a/test/functional/ex_cmds/highlight_spec.lua
+++ b/test/functional/ex_cmds/highlight_spec.lua
@@ -1,11 +1,13 @@
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local t = require('test.functional.testutil')()
-local eq, command = t.eq, t.command
-local clear = t.clear
-local eval, exc_exec = t.eval, t.exc_exec
-local exec = t.exec
-local fn = t.fn
-local api = t.api
+
+local eq, command = t.eq, n.command
+local clear = n.clear
+local eval, exc_exec = n.eval, n.exc_exec
+local exec = n.exec
+local fn = n.fn
+local api = n.api
 
 describe(':highlight', function()
   local screen
diff --git a/test/functional/ex_cmds/ls_spec.lua b/test/functional/ex_cmds/ls_spec.lua
index e8c61a0c59..aab53f0634 100644
--- a/test/functional/ex_cmds/ls_spec.lua
+++ b/test/functional/ex_cmds/ls_spec.lua
@@ -1,11 +1,13 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local command = t.command
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
+local command = n.command
 local eq = t.eq
-local eval = t.eval
-local feed = t.feed
-local api = t.api
-local testprg = t.testprg
+local eval = n.eval
+local feed = n.feed
+local api = n.api
+local testprg = n.testprg
 local retry = t.retry
 
 describe(':ls', function()
diff --git a/test/functional/ex_cmds/make_spec.lua b/test/functional/ex_cmds/make_spec.lua
index dc991dfc09..d6164cec29 100644
--- a/test/functional/ex_cmds/make_spec.lua
+++ b/test/functional/ex_cmds/make_spec.lua
@@ -1,10 +1,12 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local eval = t.eval
-local has_powershell = t.has_powershell
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
+local eval = n.eval
+local has_powershell = n.has_powershell
 local matches = t.matches
-local api = t.api
-local testprg = t.testprg
+local api = n.api
+local testprg = n.testprg
 
 describe(':make', function()
   clear()
@@ -18,7 +20,7 @@ describe(':make', function()
       return
     end
     before_each(function()
-      t.set_shell_powershell()
+      n.set_shell_powershell()
     end)
 
     it('captures stderr & non zero exit code #14349', function()
diff --git a/test/functional/ex_cmds/map_spec.lua b/test/functional/ex_cmds/map_spec.lua
index 4a20ff939c..9ef0a8ec2e 100644
--- a/test/functional/ex_cmds/map_spec.lua
+++ b/test/functional/ex_cmds/map_spec.lua
@@ -1,16 +1,17 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
 local eq = t.eq
-local exec = t.exec
-local exec_capture = t.exec_capture
-local feed = t.feed
-local api = t.api
-local clear = t.clear
-local command = t.command
-local expect = t.expect
-local insert = t.insert
-local eval = t.eval
+local exec = n.exec
+local exec_capture = n.exec_capture
+local feed = n.feed
+local api = n.api
+local clear = n.clear
+local command = n.command
+local expect = n.expect
+local insert = n.insert
+local eval = n.eval
 
 describe(':*map', function()
   before_each(clear)
diff --git a/test/functional/ex_cmds/menu_spec.lua b/test/functional/ex_cmds/menu_spec.lua
index 2834338a1a..e73f705a29 100644
--- a/test/functional/ex_cmds/menu_spec.lua
+++ b/test/functional/ex_cmds/menu_spec.lua
@@ -1,8 +1,10 @@
-local t = require('test.functional.testutil')()
-local clear, command = t.clear, t.command
-local expect, feed = t.expect, t.feed
-local eq, eval = t.eq, t.eval
-local fn = t.fn
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, command = n.clear, n.command
+local expect, feed = n.expect, n.feed
+local eq, eval = t.eq, n.eval
+local fn = n.fn
 
 describe(':emenu', function()
   before_each(function()
diff --git a/test/functional/ex_cmds/mksession_spec.lua b/test/functional/ex_cmds/mksession_spec.lua
index aeb0e5b3b0..9b24854362 100644
--- a/test/functional/ex_cmds/mksession_spec.lua
+++ b/test/functional/ex_cmds/mksession_spec.lua
@@ -1,17 +1,18 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
-local clear = t.clear
-local command = t.command
-local get_pathsep = t.get_pathsep
+local clear = n.clear
+local command = n.command
+local get_pathsep = n.get_pathsep
 local eq = t.eq
 local neq = t.neq
-local fn = t.fn
+local fn = n.fn
 local matches = t.matches
 local pesc = vim.pesc
-local rmdir = t.rmdir
+local rmdir = n.rmdir
 local sleep = vim.uv.sleep
-local api = t.api
+local api = n.api
 local skip = t.skip
 local is_os = t.is_os
 local mkdir = t.mkdir
diff --git a/test/functional/ex_cmds/mkview_spec.lua b/test/functional/ex_cmds/mkview_spec.lua
index 5dcf866490..7cc0b1da83 100644
--- a/test/functional/ex_cmds/mkview_spec.lua
+++ b/test/functional/ex_cmds/mkview_spec.lua
@@ -1,11 +1,12 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
-local clear = t.clear
-local command = t.command
-local get_pathsep = t.get_pathsep
+local clear = n.clear
+local command = n.command
+local get_pathsep = n.get_pathsep
 local eq = t.eq
-local fn = t.fn
-local rmdir = t.rmdir
+local fn = n.fn
+local rmdir = n.rmdir
 local mkdir = t.mkdir
 
 local file_prefix = 'Xtest-functional-ex_cmds-mkview_spec'
diff --git a/test/functional/ex_cmds/normal_spec.lua b/test/functional/ex_cmds/normal_spec.lua
index 0fb7635b9c..ccc649120f 100644
--- a/test/functional/ex_cmds/normal_spec.lua
+++ b/test/functional/ex_cmds/normal_spec.lua
@@ -1,11 +1,13 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local command = t.command
-local fn = t.fn
-local feed = t.feed
-local expect = t.expect
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
+local command = n.command
+local fn = n.fn
+local feed = n.feed
+local expect = n.expect
 local eq = t.eq
-local eval = t.eval
+local eval = n.eval
 
 before_each(clear)
 
diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua
index f0e6a5f53a..927d780181 100644
--- a/test/functional/ex_cmds/oldfiles_spec.lua
+++ b/test/functional/ex_cmds/oldfiles_spec.lua
@@ -1,13 +1,14 @@
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local t = require('test.functional.testutil')()
 
-local clear = t.clear
-local command = t.command
-local expect_exit = t.expect_exit
-local api, eq, feed_command = t.api, t.eq, t.feed_command
-local feed, poke_eventloop = t.feed, t.poke_eventloop
+local clear = n.clear
+local command = n.command
+local expect_exit = n.expect_exit
+local api, eq, feed_command = n.api, t.eq, n.feed_command
+local feed, poke_eventloop = n.feed, n.poke_eventloop
 local ok = t.ok
-local eval = t.eval
+local eval = n.eval
 
 local shada_file = 'Xtest.shada'
 
@@ -109,7 +110,7 @@ describe(':browse oldfiles', function()
     -- Ensure v:oldfiles isn't busted.  Since things happen so fast,
     -- the ordering of v:oldfiles is unstable (it uses qsort() under-the-hood).
     -- Let's verify the contents and the length of v:oldfiles before moving on.
-    oldfiles = t.api.nvim_get_vvar('oldfiles')
+    oldfiles = n.api.nvim_get_vvar('oldfiles')
     eq(2, #oldfiles)
     ok(filename == oldfiles[1] or filename == oldfiles[2])
     ok(filename2 == oldfiles[1] or filename2 == oldfiles[2])
diff --git a/test/functional/ex_cmds/print_commands_spec.lua b/test/functional/ex_cmds/print_commands_spec.lua
index cb94bf73de..8c164fd41b 100644
--- a/test/functional/ex_cmds/print_commands_spec.lua
+++ b/test/functional/ex_cmds/print_commands_spec.lua
@@ -1,5 +1,7 @@
-local t = require('test.functional.testutil')()
-local clear, eq, command, fn = t.clear, t.eq, t.command, t.fn
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, eq, command, fn = n.clear, t.eq, n.command, n.fn
 
 describe(':z^', function()
   before_each(clear)
diff --git a/test/functional/ex_cmds/profile_spec.lua b/test/functional/ex_cmds/profile_spec.lua
index 9dc95dbb91..57e5c6b2dc 100644
--- a/test/functional/ex_cmds/profile_spec.lua
+++ b/test/functional/ex_cmds/profile_spec.lua
@@ -1,12 +1,13 @@
-require('os')
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local uv = vim.uv
+require('os')
 
-local t = require('test.functional.testutil')()
-local eval = t.eval
-local command = t.command
+local eval = n.eval
+local command = n.command
 local eq, neq = t.eq, t.neq
 local tempfile = t.tmpname()
-local source = t.source
+local source = n.source
 local matches = t.matches
 local read_file = t.read_file
 
@@ -25,10 +26,10 @@ local function assert_file_exists_not(filepath)
 end
 
 describe(':profile', function()
-  before_each(t.clear)
+  before_each(n.clear)
 
   after_each(function()
-    t.expect_exit(command, 'qall!')
+    n.expect_exit(command, 'qall!')
     if uv.fs_stat(tempfile).uid ~= nil then
       os.remove(tempfile)
     end
diff --git a/test/functional/ex_cmds/quickfix_commands_spec.lua b/test/functional/ex_cmds/quickfix_commands_spec.lua
index 072d378875..3df41b015e 100644
--- a/test/functional/ex_cmds/quickfix_commands_spec.lua
+++ b/test/functional/ex_cmds/quickfix_commands_spec.lua
@@ -1,15 +1,16 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
-local feed = t.feed
+local feed = n.feed
 local eq = t.eq
-local clear = t.clear
-local fn = t.fn
-local command = t.command
-local exc_exec = t.exc_exec
+local clear = n.clear
+local fn = n.fn
+local command = n.command
+local exc_exec = n.exc_exec
 local write_file = t.write_file
-local api = t.api
-local source = t.source
+local api = n.api
+local source = n.source
 
 local file_base = 'Xtest-functional-ex_cmds-quickfix_commands'
 
diff --git a/test/functional/ex_cmds/quit_spec.lua b/test/functional/ex_cmds/quit_spec.lua
index 14efc9ef72..83b1c5a540 100644
--- a/test/functional/ex_cmds/quit_spec.lua
+++ b/test/functional/ex_cmds/quit_spec.lua
@@ -1,5 +1,6 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
 
 describe(':qa', function()
   before_each(function()
diff --git a/test/functional/ex_cmds/script_spec.lua b/test/functional/ex_cmds/script_spec.lua
index 2b9f3bd353..d69fae11ce 100644
--- a/test/functional/ex_cmds/script_spec.lua
+++ b/test/functional/ex_cmds/script_spec.lua
@@ -1,15 +1,16 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local eq = t.eq
 local neq = t.neq
-local command = t.command
-local exec_capture = t.exec_capture
+local command = n.command
+local exec_capture = n.exec_capture
 local write_file = t.write_file
-local api = t.api
-local clear = t.clear
+local api = n.api
+local clear = n.clear
 local dedent = t.dedent
-local exc_exec = t.exc_exec
-local missing_provider = t.missing_provider
+local exc_exec = n.exc_exec
+local missing_provider = n.missing_provider
 
 local tmpfile = 'X_ex_cmds_script'
 
diff --git a/test/functional/ex_cmds/sign_spec.lua b/test/functional/ex_cmds/sign_spec.lua
index a96873a0b0..1d1708a41c 100644
--- a/test/functional/ex_cmds/sign_spec.lua
+++ b/test/functional/ex_cmds/sign_spec.lua
@@ -1,7 +1,9 @@
-local t = require('test.functional.testutil')()
-local clear, eq, assert_alive = t.clear, t.eq, t.assert_alive
-local command = t.command
-local api = t.api
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, eq, assert_alive = n.clear, t.eq, n.assert_alive
+local command = n.command
+local api = n.api
 
 describe('sign', function()
   before_each(clear)
diff --git a/test/functional/ex_cmds/source_spec.lua b/test/functional/ex_cmds/source_spec.lua
index 99fb66cbfb..0a6f44fab4 100644
--- a/test/functional/ex_cmds/source_spec.lua
+++ b/test/functional/ex_cmds/source_spec.lua
@@ -1,22 +1,24 @@
-local t = require('test.functional.testutil')()
-local command = t.command
-local insert = t.insert
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local command = n.command
+local insert = n.insert
 local eq = t.eq
-local clear = t.clear
-local api = t.api
-local feed = t.feed
-local feed_command = t.feed_command
+local clear = n.clear
+local api = n.api
+local feed = n.feed
+local feed_command = n.feed_command
 local write_file = t.write_file
 local tmpname = t.tmpname
-local exec = t.exec
-local exc_exec = t.exc_exec
-local exec_lua = t.exec_lua
-local eval = t.eval
-local exec_capture = t.exec_capture
+local exec = n.exec
+local exc_exec = n.exc_exec
+local exec_lua = n.exec_lua
+local eval = n.eval
+local exec_capture = n.exec_capture
 local neq = t.neq
 local matches = t.matches
 local mkdir = t.mkdir
-local rmdir = t.rmdir
+local rmdir = n.rmdir
 local is_os = t.is_os
 
 describe(':source', function()
diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
index 2986b8c62f..5bb2a0181e 100644
--- a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
+++ b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
@@ -1,27 +1,29 @@
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local t = require('test.functional.testutil')()
+
 local uv = vim.uv
-local eq, eval, expect, exec = t.eq, t.eval, t.expect, t.exec
-local assert_alive = t.assert_alive
-local clear = t.clear
-local command = t.command
-local feed = t.feed
-local fn = t.fn
-local nvim_prog = t.nvim_prog
+local eq, eval, expect, exec = t.eq, n.eval, n.expect, n.exec
+local assert_alive = n.assert_alive
+local clear = n.clear
+local command = n.command
+local feed = n.feed
+local fn = n.fn
+local nvim_prog = n.nvim_prog
 local ok = t.ok
-local rmdir = t.rmdir
-local new_argv = t.new_argv
-local new_pipename = t.new_pipename
+local rmdir = n.rmdir
+local new_argv = n.new_argv
+local new_pipename = n.new_pipename
 local pesc = vim.pesc
-local os_kill = t.os_kill
-local set_session = t.set_session
-local spawn = t.spawn
-local async_meths = t.async_meths
-local expect_msg_seq = t.expect_msg_seq
+local os_kill = n.os_kill
+local set_session = n.set_session
+local spawn = n.spawn
+local async_meths = n.async_meths
+local expect_msg_seq = n.expect_msg_seq
 local pcall_err = t.pcall_err
 local mkdir = t.mkdir
-local poke_eventloop = t.poke_eventloop
-local api = t.api
+local poke_eventloop = n.poke_eventloop
+local api = n.api
 local retry = t.retry
 local write_file = t.write_file
 
@@ -118,7 +120,7 @@ describe("preserve and (R)ecover with custom 'directory'", function()
       env = { VIMRUNTIME = os.getenv('VIMRUNTIME') },
     })
     screen0:expect({ any = pesc('[No Name]') }) -- Wait for the child process to start.
-    local child_session = t.connect(child_server)
+    local child_session = n.connect(child_server)
     set_session(child_session)
     local swappath1 = setup_swapname()
     set_session(nvim0)
diff --git a/test/functional/ex_cmds/syntax_spec.lua b/test/functional/ex_cmds/syntax_spec.lua
index 879983dc53..35b45fe800 100644
--- a/test/functional/ex_cmds/syntax_spec.lua
+++ b/test/functional/ex_cmds/syntax_spec.lua
@@ -1,8 +1,9 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local eq = t.eq
-local clear = t.clear
-local exc_exec = t.exc_exec
+local clear = n.clear
+local exc_exec = n.exc_exec
 
 describe(':syntax', function()
   before_each(clear)
diff --git a/test/functional/ex_cmds/trust_spec.lua b/test/functional/ex_cmds/trust_spec.lua
index 6b3ab9ff25..76248cf530 100644
--- a/test/functional/ex_cmds/trust_spec.lua
+++ b/test/functional/ex_cmds/trust_spec.lua
@@ -1,23 +1,24 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local eq = t.eq
-local clear = t.clear
-local command = t.command
-local exec_capture = t.exec_capture
+local clear = n.clear
+local command = n.command
+local exec_capture = n.exec_capture
 local matches = t.matches
-local pathsep = t.get_pathsep()
+local pathsep = n.get_pathsep()
 local is_os = t.is_os
-local fn = t.fn
+local fn = n.fn
 
 describe(':trust', function()
   local xstate = 'Xstate'
 
   setup(function()
-    t.mkdir_p(xstate .. pathsep .. (is_os('win') and 'nvim-data' or 'nvim'))
+    n.mkdir_p(xstate .. pathsep .. (is_os('win') and 'nvim-data' or 'nvim'))
   end)
 
   teardown(function()
-    t.rmdir(xstate)
+    n.rmdir(xstate)
   end)
 
   before_each(function()
diff --git a/test/functional/ex_cmds/undojoin_spec.lua b/test/functional/ex_cmds/undojoin_spec.lua
index 90e18f6a4b..06b5973053 100644
--- a/test/functional/ex_cmds/undojoin_spec.lua
+++ b/test/functional/ex_cmds/undojoin_spec.lua
@@ -1,12 +1,13 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local eq = t.eq
-local clear = t.clear
-local insert = t.insert
-local feed = t.feed
-local expect = t.expect
-local feed_command = t.feed_command
-local exc_exec = t.exc_exec
+local clear = n.clear
+local insert = n.insert
+local feed = n.feed
+local expect = n.expect
+local feed_command = n.feed_command
+local exc_exec = n.exc_exec
 
 describe(':undojoin command', function()
   before_each(function()
diff --git a/test/functional/ex_cmds/verbose_spec.lua b/test/functional/ex_cmds/verbose_spec.lua
index 047edfba76..0f99552935 100644
--- a/test/functional/ex_cmds/verbose_spec.lua
+++ b/test/functional/ex_cmds/verbose_spec.lua
@@ -1,11 +1,12 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
-local clear = t.clear
+local clear = n.clear
 local eq = t.eq
-local exec = t.exec
-local exec_capture = t.exec_capture
+local exec = n.exec
+local exec_capture = n.exec_capture
 local write_file = t.write_file
-local call_viml_function = t.api.nvim_call_function
+local call_viml_function = n.api.nvim_call_function
 
 local function last_set_tests(cmd)
   local script_location, script_file
@@ -15,7 +16,7 @@ local function last_set_tests(cmd)
     script_file = 'test_verbose.lua'
     local current_dir = call_viml_function('getcwd', {})
     current_dir = call_viml_function('fnamemodify', { current_dir, ':~' })
-    script_location = table.concat { current_dir, t.get_pathsep(), script_file }
+    script_location = table.concat { current_dir, n.get_pathsep(), script_file }
 
     write_file(
       script_file,
diff --git a/test/functional/ex_cmds/wincmd_spec.lua b/test/functional/ex_cmds/wincmd_spec.lua
index b4e04b1884..283f0991cb 100644
--- a/test/functional/ex_cmds/wincmd_spec.lua
+++ b/test/functional/ex_cmds/wincmd_spec.lua
@@ -1,8 +1,10 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
 local eq = t.eq
-local fn = t.fn
-local command = t.command
+local fn = n.fn
+local command = n.command
 
 it(':wincmd accepts a count', function()
   clear()
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua
index dda4223a2a..bb04bfa08a 100644
--- a/test/functional/ex_cmds/write_spec.lua
+++ b/test/functional/ex_cmds/write_spec.lua
@@ -1,11 +1,13 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
 local eq, eval, clear, write_file, source, insert =
-  t.eq, t.eval, t.clear, t.write_file, t.source, t.insert
+  t.eq, n.eval, n.clear, t.write_file, n.source, n.insert
 local pcall_err = t.pcall_err
-local command = t.command
-local feed_command = t.feed_command
-local fn = t.fn
-local api = t.api
+local command = n.command
+local feed_command = n.feed_command
+local fn = n.fn
+local api = n.api
 local skip = t.skip
 local is_os = t.is_os
 local is_ci = t.is_ci
diff --git a/test/functional/ex_cmds/wundo_spec.lua b/test/functional/ex_cmds/wundo_spec.lua
index 03621205d7..2299f33f06 100644
--- a/test/functional/ex_cmds/wundo_spec.lua
+++ b/test/functional/ex_cmds/wundo_spec.lua
@@ -1,8 +1,13 @@
 -- Specs for :wundo and underlying functions
 
-local t = require('test.functional.testutil')()
-local command, clear, eval, spawn, nvim_prog, set_session =
-  t.command, t.clear, t.eval, t.spawn, t.nvim_prog, t.set_session
+local n = require('test.functional.testnvim')()
+
+local command = n.command
+local clear = n.clear
+local eval = n.eval
+local spawn = n.spawn
+local nvim_prog = n.nvim_prog
+local set_session = n.set_session
 
 describe(':wundo', function()
   before_each(clear)
diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua
index f704239c57..7c76d92228 100644
--- a/test/functional/ex_cmds/wviminfo_spec.lua
+++ b/test/functional/ex_cmds/wviminfo_spec.lua
@@ -1,6 +1,8 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local command, eq, neq, write_file = t.command, t.eq, t.neq, t.write_file
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
+local command, eq, neq, write_file = n.command, t.eq, t.neq, t.write_file
 local read_file = t.read_file
 local is_os = t.is_os