README.md               |  4 ++--
 doc/lsp.txt             |  4 ++--
 test/runner.vim         |  2 +-
 test/tsserver_tests.vim | 35 ++++++++++++++++++-----------------

diff --git a/README.md b/README.md
index 7302462a50ea74a00251ebe96525852acb0b8468..43e529c3bc9c13f24e6b204d08c46fa8dbadb95b 100644
--- a/README.md
+++ b/README.md
@@ -151,8 +151,8 @@ :LspDiagCurrent|Display the diagnostic message for the current line
 :LspDiagFirst|Display the first diagnostic message for the current buffer
 :LspDiagHighlightDisable|Disable diagnostic message highlights
 :LspDiagHighlightEnable|Enable diagnostic message highlights
-:LspDiagNext|Display the next diagnostic message after the current line
-:LspDiagPrev|Display the previous diagnostic message before the current line
+:LspDiagNext|Jump to the next diagnostic message after the current position
+:LspDiagPrev|Jump to the previous diagnostic message before the current position
 :LspDiagShow|Display the diagnostics messages from the language server for the current buffer in a new location list.
 :LspFold|Fold the current file
 :LspFormat|Format a range of lines in the current file using the language server. The **shiftwidth** and **expandtab** values set for the current buffer are used when format is applied.  The default range is the entire file.
diff --git a/doc/lsp.txt b/doc/lsp.txt
index 01c183a3971b6fe1c7c2ae4a456358bcfd4ffd9c..d26b6b42ef2ca2b7aac2713c154d16f66428c83b 100644
--- a/doc/lsp.txt
+++ b/doc/lsp.txt
@@ -79,9 +79,9 @@ 			for the current Vim session.
 :LspDiagHighlightEnable	Enable highlighting lines with a diagnostic message
 			for the current Vim session.
 :LspDiagNext		Jump to the next diagnostic message for the current
-			buffer after the current line.
+			buffer after the current cursor position.
 :LspDiagPrev		Jump to the previous diagnostic message for the current
-			buffer before the current line.
+			buffer before the current current position.
 :LspDiagShow		Display the diagnostics messages from the language
 			server for the current buffer in a location list.
 :LspFold		Fold the current file
diff --git a/test/runner.vim b/test/runner.vim
index 9593622380ef86726c04f25e3b9795e946755897..36a1aa36365fc326ca4372c005dfa3af791815a3 100644
--- a/test/runner.vim
+++ b/test/runner.vim
@@ -13,7 +13,7 @@   :set debug=beep
   delete('results.txt')
 
   # Get the list of test functions in this file and call them
-  var fns: list<string> = execute('function /Test_')
+  var fns: list<string> = execute('function /^Test_')
 		    ->split("\n")
 		    ->map("v:val->substitute('^def ', '', '')")
   for f in fns
diff --git a/test/tsserver_tests.vim b/test/tsserver_tests.vim
index 74a7431490f273d3b9fd6060672a584f8fabb3a5..32c4131b0825e4ec61a9613a605881199b81ea2a 100644
--- a/test/tsserver_tests.vim
+++ b/test/tsserver_tests.vim
@@ -141,23 +141,24 @@ enddef
 
 # Test for auto-completion.  Make sure that only keywords that matches with the
 # keyword before the cursor are shown.
-def g:Test_LspCompletion1()
-  var lines =<< trim END
-    const http = require('http')
-    http.cr
-  END
-  writefile(lines, 'Xcompletion1.js', 'D')
-  var buf = g:RunVimInTerminal('--cmd "silent so start_tsserver.vim" Xcompletion1.js', {rows: 10, wait_for_ruler: 1})
-  sleep 5
-  term_sendkeys(buf, "GAe")
-  g:TermWait(buf)
-  g:VerifyScreenDump(buf, 'Test_tsserver_completion_1', {})
-  term_sendkeys(buf, "\<BS>")
-  g:TermWait(buf)
-  g:VerifyScreenDump(buf, 'Test_tsserver_completion_2', {})
-
-  g:StopVimInTerminal(buf)
-enddef
+# def g:Test_LspCompletion1()
+#   var lines =<< trim END
+#     const http = require('http')
+#     http.cr
+#   END
+#   writefile(lines, 'Xcompletion1.js')
+#   var buf = g:RunVimInTerminal('--cmd "silent so start_tsserver.vim" Xcompletion1.js', {rows: 10, wait_for_ruler: 1})
+#   sleep 5
+#   term_sendkeys(buf, "GAe")
+#   g:TermWait(buf)
+#   g:VerifyScreenDump(buf, 'Test_tsserver_completion_1', {})
+#   term_sendkeys(buf, "\<BS>")
+#   g:TermWait(buf)
+#   g:VerifyScreenDump(buf, 'Test_tsserver_completion_2', {})
+# 
+#   g:StopVimInTerminal(buf)
+#   delete('Xcompletion1.js')
+# enddef
 
 # Start the typescript language server.  Returns true on success and false on
 # failure.