diff --git a/ale_linters/json/jq.vim b/ale_linters/json/jq.vim
index dd6ed0a6..2f36a29e 100644
--- a/ale_linters/json/jq.vim
+++ b/ale_linters/json/jq.vim
@@ -1,32 +1,24 @@
 " Author: jD91mZM2 <me@krake.one>
+call ale#Set('json_jq_executable', 'jq')
+call ale#Set('json_jq_options', '')
+call ale#Set('json_jq_filters', '.')
 
-function! ale_linters#json#jq#GetCommand(buffer) abort
-    let l:executable = ale#fixers#jq#GetExecutable(a:buffer)
-
-    return ale#Escape(l:executable)
-endfunction
+" Matches patterns like the following:
+" parse error: Expected another key-value pair at line 4, column 3
+let s:pattern = '^parse error: \(.\+\) at line \(\d\+\), column \(\d\+\)$'
 
 function! ale_linters#json#jq#Handle(buffer, lines) abort
-    " Matches patterns like the following:
-    " parse error: Expected another key-value pair at line 4, column 3
-    let l:pattern = '^parse error: \(.\+\) at line \(\d\+\), column \(\d\+\)$'
-    let l:output = []
-
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        call add(l:output, {
-        \   'text': l:match[1],
-        \   'lnum': l:match[2] + 0,
-        \   'col': l:match[3] + 0,
-        \})
-    endfor
-
-    return l:output
+    return ale#util#MapMatches(a:lines, s:pattern, {match -> {
+    \   'text': match[1],
+    \   'lnum': match[2] + 0,
+    \   'col': match[3] + 0,
+    \}})
 endfunction
 
 call ale#linter#Define('json', {
 \   'name': 'jq',
-\   'executable': function('ale#fixers#jq#GetExecutable'),
+\   'executable': {b -> ale#Var(b, 'json_jq_executable')},
 \   'output_stream': 'stderr',
-\   'command': function('ale_linters#json#jq#GetCommand'),
+\   'command': '%e',
 \   'callback': 'ale_linters#json#jq#Handle',
 \})
diff --git a/autoload/ale/assert.vim b/autoload/ale/assert.vim
index 8200a3bf..141cd0f2 100644
--- a/autoload/ale/assert.vim
+++ b/autoload/ale/assert.vim
@@ -293,7 +293,7 @@ function! ale#assert#SetUpLinterTest(filetype, name) abort
     execute 'runtime ale_linters/' . a:filetype . '/' . a:name . '.vim'
 
     if !exists('g:dir')
-        call ale#test#SetDirectory('/testplugin/test/command_callback')
+        call ale#test#SetDirectory('/testplugin/test/linter')
     endif
 
     call ale#assert#SetUpLinterTestCommands()
diff --git a/doc/ale-development.txt b/doc/ale-development.txt
index 3436b531..7f8ec28f 100644
--- a/doc/ale-development.txt
+++ b/doc/ale-development.txt
@@ -181,7 +181,7 @@ Generally write tests for any changes you make. The following types of tests
 are recommended for the following types of code.
 
 * New/edited error handler callbacks -> Write tests in `test/handler`
-* New/edited command callbacks       -> Write tests in `test/command_callback`
+* New/edited linter definition       -> Write tests in `test/linter`
 * New/edited fixer functions         -> Write tests in `test/fixers`
 
 Look at existing tests in the codebase for examples of how to write tests.
@@ -278,8 +278,8 @@ be written like so. >
   \ '1:Something went wrong',
   \ ]
 <
-Tests for what ALE runs should go in the `test/command_callback` directory,
-and should be written like so. >
+Tests for what ALE runs should go in the `test/linter` directory, and should
+be written like so. >
 
   Before:
     " Load the linter and set up a series of commands, reset linter variables,
diff --git a/test/completion/test_completion_events.vader b/test/completion/test_completion_events.vader
index 30bf603c..1b760e2c 100644
--- a/test/completion/test_completion_events.vader
+++ b/test/completion/test_completion_events.vader
@@ -11,6 +11,10 @@ Before:
   let g:feedkeys_calls = []
   let g:fake_mode = 'i'
 
+  let b:ale_linters = {
+  \ 'typescript': ['tsserver'],
+  \}
+
   let &l:completeopt = 'menu,menuone,preview,noselect,noinsert'
 
   runtime autoload/ale/util.vim
@@ -69,6 +73,7 @@ After:
   unlet! b:ale_completion_info
   unlet! b:ale_completion_result
   unlet! b:ale_complete_done_time
+  unlet! b:ale_linters
 
   delfunction CheckCompletionCalled
   delfunction ale#code_action#HandleCodeAction
diff --git a/test/fixers/test_autoimport_fixer_callback.vader b/test/fixers/test_autoimport_fixer_callback.vader
index 67dc46e9..edca5c38 100644
--- a/test/fixers/test_autoimport_fixer_callback.vader
+++ b/test/fixers/test_autoimport_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_python_autoimport_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
diff --git a/test/fixers/test_autopep8_fixer_callback.vader b/test/fixers/test_autopep8_fixer_callback.vader
index 9ca90c41..46671eda 100644
--- a/test/fixers/test_autopep8_fixer_callback.vader
+++ b/test/fixers/test_autopep8_fixer_callback.vader
@@ -7,8 +7,6 @@ Before:
   let g:ale_python_autopep8_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
   let g:dir = getcwd()
 
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
diff --git a/test/fixers/test_bibclean_fixer_callback.vader b/test/fixers/test_bibclean_fixer_callback.vader
index dd1313d2..88412eca 100644
--- a/test/fixers/test_bibclean_fixer_callback.vader
+++ b/test/fixers/test_bibclean_fixer_callback.vader
@@ -12,7 +12,7 @@ After:
   call ale#test#RestoreDirectory()
 
 Execute(The bibclean callback should return the correct default values):
-  call ale#test#SetFilename('../command_callback/../test-files/bib/dummy.bib')
+  call ale#test#SetFilename('../test-files/bib/dummy.bib')
 
   AssertEqual
   \ {'command': ale#Escape(g:ale_bib_bibclean_executable) . ' -align-equals'},
@@ -20,7 +20,7 @@ Execute(The bibclean callback should return the correct default values):
 
 Execute(The bibclean callback should include custom bibclean options):
   let g:ale_bib_bibclean_options = '-author -check-values'
-  call ale#test#SetFilename('../command_callback/../test-files/bib/dummy.bib')
+  call ale#test#SetFilename('../test-files/bib/dummy.bib')
 
   AssertEqual
   \ {
diff --git a/test/fixers/test_black_fixer_callback.vader b/test/fixers/test_black_fixer_callback.vader
index 6e9f3de7..665ba78b 100644
--- a/test/fixers/test_black_fixer_callback.vader
+++ b/test/fixers/test_black_fixer_callback.vader
@@ -1,8 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('python', 'black')
 
-  silent cd ..
-  silent cd command_callback
   let g:dir = getcwd()
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
diff --git a/test/fixers/test_clangformat_fixer_callback.vader b/test/fixers/test_clangformat_fixer_callback.vader
index 3e4546d1..130ca7f7 100644
--- a/test/fixers/test_clangformat_fixer_callback.vader
+++ b/test/fixers/test_clangformat_fixer_callback.vader
@@ -7,8 +7,6 @@ Before:
   let g:ale_c_clangformat_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
   let g:dir = getcwd()
 
 After:
diff --git a/test/fixers/test_clangtidy_fixer_callback.vader b/test/fixers/test_clangtidy_fixer_callback.vader
index 7a04e801..d6678bd9 100644
--- a/test/fixers/test_clangtidy_fixer_callback.vader
+++ b/test/fixers/test_clangtidy_fixer_callback.vader
@@ -17,8 +17,6 @@ Before:
   let g:ale_c_build_dir = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ../command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_fecs_fixer_callback.vader b/test/fixers/test_fecs_fixer_callback.vader
index b218e550..146c0a87 100644
--- a/test/fixers/test_fecs_fixer_callback.vader
+++ b/test/fixers/test_fecs_fixer_callback.vader
@@ -8,8 +8,6 @@ After:
 Execute(The fecs fixer should respect to g:ale_javascript_fecs_executable):
   let g:ale_javascript_fecs_executable = '../test-files/fecs/fecs'
   let g:ale_javascript_fecs_use_global = 1
-  silent cd ../command_callback
-  let g:dir = getcwd()
 
   AssertEqual
   \ {
diff --git a/test/fixers/test_html_beautify_fixer_callback.vader b/test/fixers/test_html_beautify_fixer_callback.vader
index 372572e4..3012c7f1 100644
--- a/test/fixers/test_html_beautify_fixer_callback.vader
+++ b/test/fixers/test_html_beautify_fixer_callback.vader
@@ -1,10 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('html', 'html-beautify', 'beautify')
 
-  call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-
 After:
   Restore
 
diff --git a/test/fixers/test_isort_fixer_callback.vader b/test/fixers/test_isort_fixer_callback.vader
index 5f3cc447..9e112c03 100644
--- a/test/fixers/test_isort_fixer_callback.vader
+++ b/test/fixers/test_isort_fixer_callback.vader
@@ -1,9 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('python', 'isort')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
 After:
diff --git a/test/fixers/test_php_cs_fixer.vader b/test/fixers/test_php_cs_fixer.vader
index 550f453c..eb4d78f8 100644
--- a/test/fixers/test_php_cs_fixer.vader
+++ b/test/fixers/test_php_cs_fixer.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_php_cs_fixer_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_phpcbf_fixer_callback.vader b/test/fixers/test_phpcbf_fixer_callback.vader
index 2d44a44d..45229a1b 100644
--- a/test/fixers/test_phpcbf_fixer_callback.vader
+++ b/test/fixers/test_phpcbf_fixer_callback.vader
@@ -9,9 +9,6 @@ Before:
   let g:ale_php_phpcbf_use_global = 0
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
@@ -75,9 +72,6 @@ Before:
   let g:ale_php_phpcbf_use_global = 0
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_prettier_fixer_callback.vader b/test/fixers/test_prettier_fixer_callback.vader
index 7e7b661d..8da13fcd 100644
--- a/test/fixers/test_prettier_fixer_callback.vader
+++ b/test/fixers/test_prettier_fixer_callback.vader
@@ -4,10 +4,6 @@ Before:
 
   let g:ale_command_wrapper = ''
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
 After:
   call ale#assert#TearDownFixerTest()
 
diff --git a/test/fixers/test_prettier_standard_callback.vader b/test/fixers/test_prettier_standard_callback.vader
index d0cf4ecf..f5037ed6 100644
--- a/test/fixers/test_prettier_standard_callback.vader
+++ b/test/fixers/test_prettier_standard_callback.vader
@@ -1,10 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('javascript', 'prettier_standard')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
 After:
   call ale#assert#TearDownFixerTest()
 
diff --git a/test/fixers/test_puppetlint_fixer_callback.vader b/test/fixers/test_puppetlint_fixer_callback.vader
index 5ccb0137..1a5a6cea 100644
--- a/test/fixers/test_puppetlint_fixer_callback.vader
+++ b/test/fixers/test_puppetlint_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_puppet_puppetlint_options = '--invalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_reorder_python_imports_fixer_callback.vader b/test/fixers/test_reorder_python_imports_fixer_callback.vader
index 74f3715d..ead2da77 100644
--- a/test/fixers/test_reorder_python_imports_fixer_callback.vader
+++ b/test/fixers/test_reorder_python_imports_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_python_reorder_python_imports_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
diff --git a/test/fixers/test_rubocop_fixer_callback.vader b/test/fixers/test_rubocop_fixer_callback.vader
index 2029df23..5b5375ae 100644
--- a/test/fixers/test_rubocop_fixer_callback.vader
+++ b/test/fixers/test_rubocop_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_ruby_rubocop_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_rufo_fixer_callback.vader b/test/fixers/test_rufo_fixer_callback.vader
index 54361784..3d539f7a 100644
--- a/test/fixers/test_rufo_fixer_callback.vader
+++ b/test/fixers/test_rufo_fixer_callback.vader
@@ -4,8 +4,7 @@ Before:
   " Use an invalid global executable, so we don't match it.
   let g:ale_ruby_rufo_executable = 'xxxinvalid'
 
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
-  let g:dir = getcwd()
+  call ale#test#SetDirectory('/testplugin/test/fixers')
 
 After:
   Restore
diff --git a/test/fixers/test_scalafmt_fixer_callback.vader b/test/fixers/test_scalafmt_fixer_callback.vader
index 94f544a1..2b8dc3eb 100644
--- a/test/fixers/test_scalafmt_fixer_callback.vader
+++ b/test/fixers/test_scalafmt_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_scala_scalafmt_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_sorbet_fixer_callback.vader b/test/fixers/test_sorbet_fixer_callback.vader
index deb2b4e0..2694a3dc 100644
--- a/test/fixers/test_sorbet_fixer_callback.vader
+++ b/test/fixers/test_sorbet_fixer_callback.vader
@@ -1,4 +1,3 @@
-
 Before:
   Save g:ale_ruby_sorbet_executable
   Save g:ale_ruby_sorbet_options
@@ -8,9 +7,6 @@ Before:
   let g:ale_ruby_sorbet_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_standardrb_fixer_callback.vader b/test/fixers/test_standardrb_fixer_callback.vader
index 31684c29..ff82b8f1 100644
--- a/test/fixers/test_standardrb_fixer_callback.vader
+++ b/test/fixers/test_standardrb_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_ruby_standardrb_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_swiftformat_fixer_callback.vader b/test/fixers/test_swiftformat_fixer_callback.vader
index d307c2b1..755c30f6 100644
--- a/test/fixers/test_swiftformat_fixer_callback.vader
+++ b/test/fixers/test_swiftformat_fixer_callback.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_swift_swiftformat_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_tidy_fixer_callback.vader b/test/fixers/test_tidy_fixer_callback.vader
index a588d75e..25d3d6c3 100644
--- a/test/fixers/test_tidy_fixer_callback.vader
+++ b/test/fixers/test_tidy_fixer_callback.vader
@@ -5,10 +5,6 @@ Before:
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
 After:
   Restore
 
diff --git a/test/fixers/test_tslint_fixer_callback.vader b/test/fixers/test_tslint_fixer_callback.vader
index 2bcbddf7..43fcc5a4 100644
--- a/test/fixers/test_tslint_fixer_callback.vader
+++ b/test/fixers/test_tslint_fixer_callback.vader
@@ -8,10 +8,7 @@ Before:
   unlet! b:ale_typescript_tslint_config_path
 
   call ale#handlers#tslint#InitVariables()
-
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
-  silent cd ..
-  silent cd command_callback
+  call ale#test#SetDirectory('/testplugin/test/fixers')
 
 After:
   Restore
diff --git a/test/fixers/test_uncrustify_fixer_callback.vader b/test/fixers/test_uncrustify_fixer_callback.vader
index 6c7f6b5d..26b5f892 100644
--- a/test/fixers/test_uncrustify_fixer_callback.vader
+++ b/test/fixers/test_uncrustify_fixer_callback.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_c_uncrustify_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_yamlfix_fixer_callback.vader b/test/fixers/test_yamlfix_fixer_callback.vader
index 4038de16..1ae5e335 100644
--- a/test/fixers/test_yamlfix_fixer_callback.vader
+++ b/test/fixers/test_yamlfix_fixer_callback.vader
@@ -1,10 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('yaml', 'yamlfix')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
 After:
diff --git a/test/fixers/test_yapf_fixer_callback.vader b/test/fixers/test_yapf_fixer_callback.vader
index 2f7a12b7..a7fcc07b 100644
--- a/test/fixers/test_yapf_fixer_callback.vader
+++ b/test/fixers/test_yapf_fixer_callback.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_python_yapf_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
diff --git a/test/handler/test_lacheck_handler.vader b/test/handler/test_lacheck_handler.vader
index 5a4f92dd..5d1b6ace 100644
--- a/test/handler/test_lacheck_handler.vader
+++ b/test/handler/test_lacheck_handler.vader
@@ -1,14 +1,13 @@
 Before:
   runtime ale_linters/tex/lacheck.vim
-  call ale#test#SetDirectory('/testplugin/test')
+  call ale#test#SetDirectory('/testplugin/test/handler')
 
 After:
   call ale#linter#Reset()
   call ale#test#RestoreDirectory()
 
 Execute(The lacheck handler should parse lines correctly):
-
-  call ale#test#SetFilename('command_callback/../test-files/tex/sample1.tex')
+  call ale#test#SetFilename('../test-files/tex/sample1.tex')
 
   AssertEqual
   \ [
@@ -24,7 +23,6 @@ Execute(The lacheck handler should parse lines correctly):
   \ ])
 
 Execute(The lacheck handler should ignore errors from input files):
-
   call ale#test#SetFilename('ale_test.tex')
 
   AssertEqual
diff --git a/test/command_callback/test_ada_gcc_command_callbacks.vader b/test/linter/test_ada_gcc.vader
similarity index 100%
rename from test/command_callback/test_ada_gcc_command_callbacks.vader
rename to test/linter/test_ada_gcc.vader
diff --git a/test/command_callback/test_adals_command_callbacks.vader b/test/linter/test_adals.vader
similarity index 100%
rename from test/command_callback/test_adals_command_callbacks.vader
rename to test/linter/test_adals.vader
diff --git a/test/command_callback/test_alex_command_callback.vader b/test/linter/test_alex.vader
similarity index 100%
rename from test/command_callback/test_alex_command_callback.vader
rename to test/linter/test_alex.vader
diff --git a/test/command_callback/test_ameba_command_callback.vader b/test/linter/test_ameba.vader
similarity index 100%
rename from test/command_callback/test_ameba_command_callback.vader
rename to test/linter/test_ameba.vader
diff --git a/test/command_callback/test_angular_command_callback.vader b/test/linter/test_angular.vader
similarity index 100%
rename from test/command_callback/test_angular_command_callback.vader
rename to test/linter/test_angular.vader
diff --git a/test/command_callback/test_ansible_lint_command_callback.vader b/test/linter/test_ansible_lint.vader
similarity index 100%
rename from test/command_callback/test_ansible_lint_command_callback.vader
rename to test/linter/test_ansible_lint.vader
diff --git a/test/command_callback/test_asciidoc_textlint_command_callbacks.vader b/test/linter/test_asciidoc_textlint.vader
similarity index 100%
rename from test/command_callback/test_asciidoc_textlint_command_callbacks.vader
rename to test/linter/test_asciidoc_textlint.vader
diff --git a/test/command_callback/test_asm_gcc_command_callbacks.vader b/test/linter/test_asm_gcc.vader
similarity index 100%
rename from test/command_callback/test_asm_gcc_command_callbacks.vader
rename to test/linter/test_asm_gcc.vader
diff --git a/test/command_callback/test_bandit_command_callback.vader b/test/linter/test_bandit.vader
similarity index 100%
rename from test/command_callback/test_bandit_command_callback.vader
rename to test/linter/test_bandit.vader
diff --git a/test/command_callback/test_bashate_command_callback.vader b/test/linter/test_bashate.vader
similarity index 100%
rename from test/command_callback/test_bashate_command_callback.vader
rename to test/linter/test_bashate.vader
diff --git a/test/command_callback/test_bib_bibclean_command_callback.vader b/test/linter/test_bib_bibclean.vader
similarity index 100%
rename from test/command_callback/test_bib_bibclean_command_callback.vader
rename to test/linter/test_bib_bibclean.vader
diff --git a/test/command_callback/test_bingo_command_callback.vader b/test/linter/test_bingo.vader
similarity index 100%
rename from test/command_callback/test_bingo_command_callback.vader
rename to test/linter/test_bingo.vader
diff --git a/test/command_callback/test_brakeman_command_callback.vader b/test/linter/test_brakeman.vader
similarity index 100%
rename from test/command_callback/test_brakeman_command_callback.vader
rename to test/linter/test_brakeman.vader
diff --git a/test/command_callback/test_c_cc_command_callbacks.vader b/test/linter/test_c_cc.vader
similarity index 100%
rename from test/command_callback/test_c_cc_command_callbacks.vader
rename to test/linter/test_c_cc.vader
diff --git a/test/command_callback/test_c_ccls_command_callbacks.vader b/test/linter/test_c_ccls.vader
similarity index 100%
rename from test/command_callback/test_c_ccls_command_callbacks.vader
rename to test/linter/test_c_ccls.vader
diff --git a/test/command_callback/test_c_clang_tidy_command_callback.vader b/test/linter/test_c_clang_tidy.vader
similarity index 100%
rename from test/command_callback/test_c_clang_tidy_command_callback.vader
rename to test/linter/test_c_clang_tidy.vader
diff --git a/test/command_callback/test_c_clangd_command_callbacks.vader b/test/linter/test_c_clangd.vader
similarity index 97%
rename from test/command_callback/test_c_clangd_command_callbacks.vader
rename to test/linter/test_c_clangd.vader
index 438bc80e..b7a4e029 100644
--- a/test/command_callback/test_c_clangd_command_callbacks.vader
+++ b/test/linter/test_c_clangd.vader
@@ -1,9 +1,6 @@
 Before:
   call ale#assert#SetUpLinterTest('c', 'clangd')
 
-  Save &filetype
-  let &filetype = 'c'
-
   Save b:ale_c_clangd_options
   Save b:ale_c_build_dir
   Save b:ale_c_build_dir_names
@@ -48,4 +45,3 @@ Execute(The compile command database should be detected correctly):
   AssertLinter 'clangd', ale#Escape('clangd')
   \  . ' -compile-commands-dir='
   \  . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/clangd/with_build_dir/unusual_build_dir_name'))
-
diff --git a/test/command_callback/test_c_cppcheck_command_callbacks.vader b/test/linter/test_c_cppcheck.vader
similarity index 75%
rename from test/command_callback/test_c_cppcheck_command_callbacks.vader
rename to test/linter/test_c_cppcheck.vader
index 40685dab..c84053f8 100644
--- a/test/command_callback/test_c_cppcheck_command_callbacks.vader
+++ b/test/linter/test_c_cppcheck.vader
@@ -3,12 +3,6 @@ Before:
   let b:command_tail = ' -q --language=c --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') . ' --enable=style -I' . ale#Escape(ale#path#Simplify(g:dir)) .' %t'
 
 After:
-  " Remove a test file we might open for some tests.
-  if &buftype != 'nofile'
-    :q!
-    set buftype=nofile
-  endif
-
   unlet! b:command_tail
   call ale#assert#TearDownLinterTest()
 
@@ -50,17 +44,3 @@ Execute(cppcheck for C should include file dir if compile_commands.json file is
   \   . ' --enable=style'
   \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cppcheck'))
   \   . ' %t'
-
-Execute(cppcheck for C should ignore compile_commands.json file if buffer is modified):
-  call ale#test#SetFilename('../test-files/cppcheck/one/foo.c')
-
-  set buftype=
-  set modified
-
-  AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cppcheck/one')
-  AssertLinter 'cppcheck', ale#Escape('cppcheck')
-  \   . ' -q --language=c'
-  \   . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
-  \   . ' --enable=style'
-  \   . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cppcheck/one'))
-  \   . ' %t'
diff --git a/test/command_callback/test_c_cquery_command_callbacks.vader b/test/linter/test_c_cquery.vader
similarity index 100%
rename from test/command_callback/test_c_cquery_command_callbacks.vader
rename to test/linter/test_c_cquery.vader
diff --git a/test/command_callback/test_c_flawfinder_command_callbacks.vader b/test/linter/test_c_flawfinder.vader
similarity index 100%
rename from test/command_callback/test_c_flawfinder_command_callbacks.vader
rename to test/linter/test_c_flawfinder.vader
diff --git a/test/command_callback/test_c_import_paths.vader b/test/linter/test_c_import_paths.vader
similarity index 100%
rename from test/command_callback/test_c_import_paths.vader
rename to test/linter/test_c_import_paths.vader
diff --git a/test/command_callback/test_cargo_command_callbacks.vader b/test/linter/test_cargo.vader
similarity index 100%
rename from test/command_callback/test_cargo_command_callbacks.vader
rename to test/linter/test_cargo.vader
diff --git a/test/command_callback/test_checkstyle_command_callback.vader b/test/linter/test_checkstyle.vader
similarity index 100%
rename from test/command_callback/test_checkstyle_command_callback.vader
rename to test/linter/test_checkstyle.vader
diff --git a/test/command_callback/test_clang_tidy_command_callback.vader b/test/linter/test_clang_tidy.vader
similarity index 100%
rename from test/command_callback/test_clang_tidy_command_callback.vader
rename to test/linter/test_clang_tidy.vader
diff --git a/test/command_callback/test_cookstyle_command_callback.vader b/test/linter/test_cookstyle.vader
similarity index 100%
rename from test/command_callback/test_cookstyle_command_callback.vader
rename to test/linter/test_cookstyle.vader
diff --git a/test/command_callback/test_cpp_cc_command_callbacks.vader b/test/linter/test_cpp_cc.vader
similarity index 100%
rename from test/command_callback/test_cpp_cc_command_callbacks.vader
rename to test/linter/test_cpp_cc.vader
diff --git a/test/command_callback/test_cpp_ccls_command_callbacks.vader b/test/linter/test_cpp_ccls.vader
similarity index 100%
rename from test/command_callback/test_cpp_ccls_command_callbacks.vader
rename to test/linter/test_cpp_ccls.vader
diff --git a/test/command_callback/test_cpp_clangcheck_command_callbacks.vader b/test/linter/test_cpp_clangcheck.vader
similarity index 100%
rename from test/command_callback/test_cpp_clangcheck_command_callbacks.vader
rename to test/linter/test_cpp_clangcheck.vader
diff --git a/test/command_callback/test_cpp_clazy_command_callback.vader b/test/linter/test_cpp_clazy.vader
similarity index 100%
rename from test/command_callback/test_cpp_clazy_command_callback.vader
rename to test/linter/test_cpp_clazy.vader
diff --git a/test/command_callback/test_cpp_cppcheck_command_callbacks.vader b/test/linter/test_cpp_cppcheck.vader
similarity index 100%
rename from test/command_callback/test_cpp_cppcheck_command_callbacks.vader
rename to test/linter/test_cpp_cppcheck.vader
diff --git a/test/command_callback/test_cpp_cquery_command_callbacks.vader b/test/linter/test_cpp_cquery.vader
similarity index 100%
rename from test/command_callback/test_cpp_cquery_command_callbacks.vader
rename to test/linter/test_cpp_cquery.vader
diff --git a/test/command_callback/test_cpp_flawfinder_command_callbacks.vader b/test/linter/test_cpp_flawfinder.vader
similarity index 100%
rename from test/command_callback/test_cpp_flawfinder_command_callbacks.vader
rename to test/linter/test_cpp_flawfinder.vader
diff --git a/test/command_callback/test_cpplint_command_callbacks.vader b/test/linter/test_cpplint.vader
similarity index 100%
rename from test/command_callback/test_cpplint_command_callbacks.vader
rename to test/linter/test_cpplint.vader
diff --git a/test/command_callback/test_cs_csc_command_callbacks.vader b/test/linter/test_cs_csc.vader
similarity index 100%
rename from test/command_callback/test_cs_csc_command_callbacks.vader
rename to test/linter/test_cs_csc.vader
diff --git a/test/command_callback/test_cs_mcs_command_callbacks.vader b/test/linter/test_cs_mcs.vader
similarity index 100%
rename from test/command_callback/test_cs_mcs_command_callbacks.vader
rename to test/linter/test_cs_mcs.vader
diff --git a/test/command_callback/test_cs_mcsc_command_callbacks.vader b/test/linter/test_cs_mcsc.vader
similarity index 100%
rename from test/command_callback/test_cs_mcsc_command_callbacks.vader
rename to test/linter/test_cs_mcsc.vader
diff --git a/test/command_callback/test_cucumber_command_callback.vader b/test/linter/test_cucumber.vader
similarity index 100%
rename from test/command_callback/test_cucumber_command_callback.vader
rename to test/linter/test_cucumber.vader
diff --git a/test/command_callback/test_cuda_nvcc_command_callbacks.vader b/test/linter/test_cuda_nvcc.vader
similarity index 100%
rename from test/command_callback/test_cuda_nvcc_command_callbacks.vader
rename to test/linter/test_cuda_nvcc.vader
diff --git a/test/command_callback/test_cypher_cypher_lint_command_callback.vader b/test/linter/test_cypher_cypher_lint.vader
similarity index 100%
rename from test/command_callback/test_cypher_cypher_lint_command_callback.vader
rename to test/linter/test_cypher_cypher_lint.vader
diff --git a/test/command_callback/test_d_dls_callbacks.vader b/test/linter/test_d_dls.vader
similarity index 100%
rename from test/command_callback/test_d_dls_callbacks.vader
rename to test/linter/test_d_dls.vader
diff --git a/test/command_callback/test_dart_analysis_server_command_callback.vader b/test/linter/test_dart_analysis_server.vader
similarity index 100%
rename from test/command_callback/test_dart_analysis_server_command_callback.vader
rename to test/linter/test_dart_analysis_server.vader
diff --git a/test/command_callback/test_dart_language_server_command_callback.vader b/test/linter/test_dart_language_server.vader
similarity index 100%
rename from test/command_callback/test_dart_language_server_command_callback.vader
rename to test/linter/test_dart_language_server.vader
diff --git a/test/command_callback/test_dartanalyzer_command_callback.vader b/test/linter/test_dartanalyzer.vader
similarity index 100%
rename from test/command_callback/test_dartanalyzer_command_callback.vader
rename to test/linter/test_dartanalyzer.vader
diff --git a/test/command_callback/test_desktop_file_validate.vader b/test/linter/test_desktop_file_validate.vader
similarity index 100%
rename from test/command_callback/test_desktop_file_validate.vader
rename to test/linter/test_desktop_file_validate.vader
diff --git a/test/command_callback/test_dialyxir_command_callback.vader b/test/linter/test_dialyxir.vader
similarity index 100%
rename from test/command_callback/test_dialyxir_command_callback.vader
rename to test/linter/test_dialyxir.vader
diff --git a/test/command_callback/test_dockerfile_lint_command_callback.vader b/test/linter/test_dockerfile_lint.vader
similarity index 100%
rename from test/command_callback/test_dockerfile_lint_command_callback.vader
rename to test/linter/test_dockerfile_lint.vader
diff --git a/test/command_callback/test_dogma_command_callback.vader b/test/linter/test_dogma.vader
similarity index 100%
rename from test/command_callback/test_dogma_command_callback.vader
rename to test/linter/test_dogma.vader
diff --git a/test/command_callback/test_eclipselsp_command_callback.vader b/test/linter/test_eclipselsp.vader
similarity index 100%
rename from test/command_callback/test_eclipselsp_command_callback.vader
rename to test/linter/test_eclipselsp.vader
diff --git a/test/command_callback/test_elixir_credo_command_callback.vader b/test/linter/test_elixir_credo.vader
similarity index 100%
rename from test/command_callback/test_elixir_credo_command_callback.vader
rename to test/linter/test_elixir_credo.vader
diff --git a/test/command_callback/test_elixir_ls_command_callbacks.vader b/test/linter/test_elixir_ls.vader
similarity index 100%
rename from test/command_callback/test_elixir_ls_command_callbacks.vader
rename to test/linter/test_elixir_ls.vader
diff --git a/test/command_callback/test_elixir_mix_command_callbacks.vader b/test/linter/test_elixir_mix.vader
similarity index 100%
rename from test/command_callback/test_elixir_mix_command_callbacks.vader
rename to test/linter/test_elixir_mix.vader
diff --git a/test/command_callback/test_elm_ls_command_callbacks.vader b/test/linter/test_elm_ls.vader
similarity index 100%
rename from test/command_callback/test_elm_ls_command_callbacks.vader
rename to test/linter/test_elm_ls.vader
diff --git a/test/command_callback/test_elm_make_command_callback.vader b/test/linter/test_elm_make.vader
similarity index 100%
rename from test/command_callback/test_elm_make_command_callback.vader
rename to test/linter/test_elm_make.vader
diff --git a/test/command_callback/test_embertemplatelint_command_callbacks.vader b/test/linter/test_embertemplatelint.vader
similarity index 100%
rename from test/command_callback/test_embertemplatelint_command_callbacks.vader
rename to test/linter/test_embertemplatelint.vader
diff --git a/test/command_callback/test_erb_command_callback.vader b/test/linter/test_erb.vader
similarity index 100%
rename from test/command_callback/test_erb_command_callback.vader
rename to test/linter/test_erb.vader
diff --git a/test/command_callback/test_erlang_dialyzer_command_callback.vader b/test/linter/test_erlang_dialyzer.vader
similarity index 100%
rename from test/command_callback/test_erlang_dialyzer_command_callback.vader
rename to test/linter/test_erlang_dialyzer.vader
diff --git a/test/command_callback/test_erlang_elvis_command_callback.vader b/test/linter/test_erlang_elvis.vader
similarity index 100%
rename from test/command_callback/test_erlang_elvis_command_callback.vader
rename to test/linter/test_erlang_elvis.vader
diff --git a/test/command_callback/test_erlang_erlc_command_callback.vader b/test/linter/test_erlang_erlc.vader
similarity index 100%
rename from test/command_callback/test_erlang_erlc_command_callback.vader
rename to test/linter/test_erlang_erlc.vader
diff --git a/test/command_callback/test_erlang_syntaxerl_command_callback.vader b/test/linter/test_erlang_syntaxerl.vader
similarity index 100%
rename from test/command_callback/test_erlang_syntaxerl_command_callback.vader
rename to test/linter/test_erlang_syntaxerl.vader
diff --git a/test/command_callback/test_erubi_command_callback.vader b/test/linter/test_erubi.vader
similarity index 100%
rename from test/command_callback/test_erubi_command_callback.vader
rename to test/linter/test_erubi.vader
diff --git a/test/command_callback/test_erubis_command_callback.vader b/test/linter/test_erubis.vader
similarity index 100%
rename from test/command_callback/test_erubis_command_callback.vader
rename to test/linter/test_erubis.vader
diff --git a/test/command_callback/test_eslint_command_callback.vader b/test/linter/test_eslint.vader
similarity index 100%
rename from test/command_callback/test_eslint_command_callback.vader
rename to test/linter/test_eslint.vader
diff --git a/test/command_callback/test_fecs_command_callback.vader b/test/linter/test_fecs.vader
similarity index 100%
rename from test/command_callback/test_fecs_command_callback.vader
rename to test/linter/test_fecs.vader
diff --git a/test/command_callback/test_flake8_command_callback.vader b/test/linter/test_flake8.vader
similarity index 100%
rename from test/command_callback/test_flake8_command_callback.vader
rename to test/linter/test_flake8.vader
diff --git a/test/command_callback/test_flow_command_callback.vader b/test/linter/test_flow.vader
similarity index 100%
rename from test/command_callback/test_flow_command_callback.vader
rename to test/linter/test_flow.vader
diff --git a/test/command_callback/test_foodcritic_command_callback.vader b/test/linter/test_foodcritic.vader
similarity index 100%
rename from test/command_callback/test_foodcritic_command_callback.vader
rename to test/linter/test_foodcritic.vader
diff --git a/test/command_callback/test_fortran_fortls_callback.vader b/test/linter/test_fortran_fortls.vader
similarity index 100%
rename from test/command_callback/test_fortran_fortls_callback.vader
rename to test/linter/test_fortran_fortls.vader
diff --git a/test/command_callback/test_fsc_command_callback.vader b/test/linter/test_fsc.vader
similarity index 100%
rename from test/command_callback/test_fsc_command_callback.vader
rename to test/linter/test_fsc.vader
diff --git a/test/command_callback/test_fusionlint_command_callback.vader b/test/linter/test_fusionlint.vader
similarity index 100%
rename from test/command_callback/test_fusionlint_command_callback.vader
rename to test/linter/test_fusionlint.vader
diff --git a/test/command_callback/test_gawk_command_callback.vader b/test/linter/test_gawk.vader
similarity index 100%
rename from test/command_callback/test_gawk_command_callback.vader
rename to test/linter/test_gawk.vader
diff --git a/test/command_callback/test_gfortran_command_callback.vader b/test/linter/test_gfortran.vader
similarity index 100%
rename from test/command_callback/test_gfortran_command_callback.vader
rename to test/linter/test_gfortran.vader
diff --git a/test/command_callback/test_ghdl_command_callbacks.vader b/test/linter/test_ghdl.vader
similarity index 100%
rename from test/command_callback/test_ghdl_command_callbacks.vader
rename to test/linter/test_ghdl.vader
diff --git a/test/command_callback/test_gitlint_command_callback.vader b/test/linter/test_gitlint.vader
similarity index 100%
rename from test/command_callback/test_gitlint_command_callback.vader
rename to test/linter/test_gitlint.vader
diff --git a/test/command_callback/test_glslang_command_callback.vader b/test/linter/test_glslang.vader
similarity index 100%
rename from test/command_callback/test_glslang_command_callback.vader
rename to test/linter/test_glslang.vader
diff --git a/test/command_callback/test_glslls_command_callback.vader b/test/linter/test_glslls.vader
similarity index 100%
rename from test/command_callback/test_glslls_command_callback.vader
rename to test/linter/test_glslls.vader
diff --git a/test/command_callback/test_gobuild_command_callback.vader b/test/linter/test_gobuild.vader
similarity index 100%
rename from test/command_callback/test_gobuild_command_callback.vader
rename to test/linter/test_gobuild.vader
diff --git a/test/command_callback/test_gofmt_command_callback.vader b/test/linter/test_gofmt.vader
similarity index 100%
rename from test/command_callback/test_gofmt_command_callback.vader
rename to test/linter/test_gofmt.vader
diff --git a/test/command_callback/test_golangci_lint_command_callback.vader b/test/linter/test_golangci_lint.vader
similarity index 100%
rename from test/command_callback/test_golangci_lint_command_callback.vader
rename to test/linter/test_golangci_lint.vader
diff --git a/test/command_callback/test_golangserver_command_callback.vader b/test/linter/test_golangserver.vader
similarity index 100%
rename from test/command_callback/test_golangserver_command_callback.vader
rename to test/linter/test_golangserver.vader
diff --git a/test/command_callback/test_golint_command_callbacks.vader b/test/linter/test_golint.vader
similarity index 100%
rename from test/command_callback/test_golint_command_callbacks.vader
rename to test/linter/test_golint.vader
diff --git a/test/command_callback/test_gometalinter_command_callback.vader b/test/linter/test_gometalinter.vader
similarity index 100%
rename from test/command_callback/test_gometalinter_command_callback.vader
rename to test/linter/test_gometalinter.vader
diff --git a/test/command_callback/test_gopls_command_callback.vader b/test/linter/test_gopls.vader
similarity index 100%
rename from test/command_callback/test_gopls_command_callback.vader
rename to test/linter/test_gopls.vader
diff --git a/test/command_callback/test_gosimple_command_callback.vader b/test/linter/test_gosimple.vader
similarity index 100%
rename from test/command_callback/test_gosimple_command_callback.vader
rename to test/linter/test_gosimple.vader
diff --git a/test/command_callback/test_gotype_command_callback.vader b/test/linter/test_gotype.vader
similarity index 100%
rename from test/command_callback/test_gotype_command_callback.vader
rename to test/linter/test_gotype.vader
diff --git a/test/command_callback/test_govet_command_callback.vader b/test/linter/test_govet.vader
similarity index 100%
rename from test/command_callback/test_govet_command_callback.vader
rename to test/linter/test_govet.vader
diff --git a/test/command_callback/test_graphql_gqlint_command_callbacks.vader b/test/linter/test_graphql_gqlint.vader
similarity index 100%
rename from test/command_callback/test_graphql_gqlint_command_callbacks.vader
rename to test/linter/test_graphql_gqlint.vader
diff --git a/test/command_callback/test_haml_hamllint_command_callback.vader b/test/linter/test_haml_hamllint.vader
similarity index 100%
rename from test/command_callback/test_haml_hamllint_command_callback.vader
rename to test/linter/test_haml_hamllint.vader
diff --git a/test/command_callback/test_haskell_cabal_ghc_command_callbacks.vader b/test/linter/test_haskell_cabal_ghc.vader
similarity index 100%
rename from test/command_callback/test_haskell_cabal_ghc_command_callbacks.vader
rename to test/linter/test_haskell_cabal_ghc.vader
diff --git a/test/command_callback/test_haskell_ghc_command_callbacks.vader b/test/linter/test_haskell_ghc.vader
similarity index 100%
rename from test/command_callback/test_haskell_ghc_command_callbacks.vader
rename to test/linter/test_haskell_ghc.vader
diff --git a/test/command_callback/test_haskell_ghc_mod_command_callbacks.vader b/test/linter/test_haskell_ghc_mod.vader
similarity index 100%
rename from test/command_callback/test_haskell_ghc_mod_command_callbacks.vader
rename to test/linter/test_haskell_ghc_mod.vader
diff --git a/test/command_callback/test_haskell_hdevtools_command_callbacks.vader b/test/linter/test_haskell_hdevtools.vader
similarity index 100%
rename from test/command_callback/test_haskell_hdevtools_command_callbacks.vader
rename to test/linter/test_haskell_hdevtools.vader
diff --git a/test/command_callback/test_haskell_hie_callbacks.vader b/test/linter/test_haskell_hie.vader
similarity index 100%
rename from test/command_callback/test_haskell_hie_callbacks.vader
rename to test/linter/test_haskell_hie.vader
diff --git a/test/command_callback/test_haskell_hlint_command_callbacks.vader b/test/linter/test_haskell_hlint.vader
similarity index 100%
rename from test/command_callback/test_haskell_hlint_command_callbacks.vader
rename to test/linter/test_haskell_hlint.vader
diff --git a/test/command_callback/test_haskell_hls_callbacks.vader b/test/linter/test_haskell_hls.vader
similarity index 100%
rename from test/command_callback/test_haskell_hls_callbacks.vader
rename to test/linter/test_haskell_hls.vader
diff --git a/test/command_callback/test_haskell_stack_build_command_callback.vader b/test/linter/test_haskell_stack_build.vader
similarity index 100%
rename from test/command_callback/test_haskell_stack_build_command_callback.vader
rename to test/linter/test_haskell_stack_build.vader
diff --git a/test/command_callback/test_haskell_stack_ghc_command_callback.vader b/test/linter/test_haskell_stack_ghc.vader
similarity index 100%
rename from test/command_callback/test_haskell_stack_ghc_command_callback.vader
rename to test/linter/test_haskell_stack_ghc.vader
diff --git a/test/test_hdl_checker_options.vader b/test/linter/test_hdl_checker_options.vader
similarity index 100%
rename from test/test_hdl_checker_options.vader
rename to test/linter/test_hdl_checker_options.vader
diff --git a/test/command_callback/test_html_stylelint_command_callback.vader b/test/linter/test_html_stylelint.vader
similarity index 96%
rename from test/command_callback/test_html_stylelint_command_callback.vader
rename to test/linter/test_html_stylelint.vader
index 87440217..c5ac1b98 100644
--- a/test/command_callback/test_html_stylelint_command_callback.vader
+++ b/test/linter/test_html_stylelint.vader
@@ -9,7 +9,7 @@ Before:
   unlet! g:ale_html_stylelint_use_global
   unlet! g:ale_html_stylelint_options
 
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
+  call ale#test#SetDirectory('/testplugin/test/linter')
   call ale#test#SetFilename('testfile.html')
 
   runtime ale_linters/html/stylelint.vim
diff --git a/test/command_callback/test_htmlhint_command_callback.vader b/test/linter/test_htmlhint.vader
similarity index 100%
rename from test/command_callback/test_htmlhint_command_callback.vader
rename to test/linter/test_htmlhint.vader
diff --git a/test/command_callback/test_ibm_openapi_validator_command_callback.vader b/test/linter/test_ibm_openapi_validator.vader
similarity index 100%
rename from test/command_callback/test_ibm_openapi_validator_command_callback.vader
rename to test/linter/test_ibm_openapi_validator.vader
diff --git a/test/command_callback/test_idris_command_callbacks.vader b/test/linter/test_idris.vader
similarity index 100%
rename from test/command_callback/test_idris_command_callbacks.vader
rename to test/linter/test_idris.vader
diff --git a/test/command_callback/test_ink_ls_command_callbacks.vader b/test/linter/test_ink_ls.vader
similarity index 100%
rename from test/command_callback/test_ink_ls_command_callbacks.vader
rename to test/linter/test_ink_ls.vader
diff --git a/test/command_callback/test_inko_inko_callbacks.vader b/test/linter/test_inko_inko.vader
similarity index 100%
rename from test/command_callback/test_inko_inko_callbacks.vader
rename to test/linter/test_inko_inko.vader
diff --git a/test/command_callback/test_ispc_ispc_command_callbacks.vader b/test/linter/test_ispc_ispc.vader
similarity index 100%
rename from test/command_callback/test_ispc_ispc_command_callbacks.vader
rename to test/linter/test_ispc_ispc.vader
diff --git a/test/command_callback/test_iverilog_command_callback.vader b/test/linter/test_iverilog.vader
similarity index 100%
rename from test/command_callback/test_iverilog_command_callback.vader
rename to test/linter/test_iverilog.vader
diff --git a/test/command_callback/test_javac_command_callback.vader b/test/linter/test_javac.vader
similarity index 100%
rename from test/command_callback/test_javac_command_callback.vader
rename to test/linter/test_javac.vader
diff --git a/test/command_callback/test_javalsp_command_callback.vader b/test/linter/test_javalsp.vader
similarity index 100%
rename from test/command_callback/test_javalsp_command_callback.vader
rename to test/linter/test_javalsp.vader
diff --git a/test/command_callback/test_javascript_tsserver_command_callback.vader b/test/linter/test_javascript_tsserver.vader
similarity index 100%
rename from test/command_callback/test_javascript_tsserver_command_callback.vader
rename to test/linter/test_javascript_tsserver.vader
diff --git a/test/command_callback/test_jq_command_callback.vader b/test/linter/test_jq.vader
similarity index 100%
rename from test/command_callback/test_jq_command_callback.vader
rename to test/linter/test_jq.vader
diff --git a/test/command_callback/test_jscs_command_callback.vader b/test/linter/test_jscs.vader
similarity index 100%
rename from test/command_callback/test_jscs_command_callback.vader
rename to test/linter/test_jscs.vader
diff --git a/test/command_callback/test_jshint_command_callback.vader b/test/linter/test_jshint.vader
similarity index 100%
rename from test/command_callback/test_jshint_command_callback.vader
rename to test/linter/test_jshint.vader
diff --git a/test/command_callback/test_julia_languageserver_callbacks.vader b/test/linter/test_julia_languageserver.vader
similarity index 100%
rename from test/command_callback/test_julia_languageserver_callbacks.vader
rename to test/linter/test_julia_languageserver.vader
diff --git a/test/command_callback/test_kotlin_languageserver_command_callback.vader b/test/linter/test_kotlin_languageserver.vader
similarity index 100%
rename from test/command_callback/test_kotlin_languageserver_command_callback.vader
rename to test/linter/test_kotlin_languageserver.vader
diff --git a/test/command_callback/test_kotlinc_command_callback.vader b/test/linter/test_kotlinc.vader
similarity index 100%
rename from test/command_callback/test_kotlinc_command_callback.vader
rename to test/linter/test_kotlinc.vader
diff --git a/test/command_callback/test_languagetool_command_callback.vader b/test/linter/test_languagetool.vader
similarity index 100%
rename from test/command_callback/test_languagetool_command_callback.vader
rename to test/linter/test_languagetool.vader
diff --git a/test/command_callback/test_less_stylelint_command_callback.vader b/test/linter/test_less_stylelint.vader
similarity index 100%
rename from test/command_callback/test_less_stylelint_command_callback.vader
rename to test/linter/test_less_stylelint.vader
diff --git a/test/command_callback/test_lessc_command_callback.vader b/test/linter/test_lessc.vader
similarity index 100%
rename from test/command_callback/test_lessc_command_callback.vader
rename to test/linter/test_lessc.vader
diff --git a/test/command_callback/test_lintr_command_callback.vader b/test/linter/test_lintr.vader
similarity index 100%
rename from test/command_callback/test_lintr_command_callback.vader
rename to test/linter/test_lintr.vader
diff --git a/test/command_callback/test_llc_command_callback.vader b/test/linter/test_llc.vader
similarity index 100%
rename from test/command_callback/test_llc_command_callback.vader
rename to test/linter/test_llc.vader
diff --git a/test/command_callback/test_luac_command_callback.vader b/test/linter/test_luac.vader
similarity index 100%
rename from test/command_callback/test_luac_command_callback.vader
rename to test/linter/test_luac.vader
diff --git a/test/command_callback/test_luacheck_command_callback.vader b/test/linter/test_luacheck.vader
similarity index 100%
rename from test/command_callback/test_luacheck_command_callback.vader
rename to test/linter/test_luacheck.vader
diff --git a/test/command_callback/test_markdown_markdownlint_command_callback.vader b/test/linter/test_markdown_markdownlint.vader
similarity index 100%
rename from test/command_callback/test_markdown_markdownlint_command_callback.vader
rename to test/linter/test_markdown_markdownlint.vader
diff --git a/test/command_callback/test_markdown_mdl_command_callback.vader b/test/linter/test_markdown_mdl.vader
similarity index 100%
rename from test/command_callback/test_markdown_mdl_command_callback.vader
rename to test/linter/test_markdown_mdl.vader
diff --git a/test/command_callback/test_markdown_vale_command_callback.vader b/test/linter/test_markdown_vale.vader
similarity index 100%
rename from test/command_callback/test_markdown_vale_command_callback.vader
rename to test/linter/test_markdown_vale.vader
diff --git a/test/command_callback/test_mercury_mmc_command_callback.vader b/test/linter/test_mercury_mmc.vader
similarity index 100%
rename from test/command_callback/test_mercury_mmc_command_callback.vader
rename to test/linter/test_mercury_mmc.vader
diff --git a/test/command_callback/test_mypy_command_callback.vader b/test/linter/test_mypy.vader
similarity index 100%
rename from test/command_callback/test_mypy_command_callback.vader
rename to test/linter/test_mypy.vader
diff --git a/test/command_callback/test_nagelfar_command_callbacks.vader b/test/linter/test_nagelfar.vader
similarity index 100%
rename from test/command_callback/test_nagelfar_command_callbacks.vader
rename to test/linter/test_nagelfar.vader
diff --git a/test/command_callback/test_nasm_nasm_command_callbacks.vader b/test/linter/test_nasm_nasm.vader
similarity index 100%
rename from test/command_callback/test_nasm_nasm_command_callbacks.vader
rename to test/linter/test_nasm_nasm.vader
diff --git a/test/command_callback/test_nimlsp_command_callback.vader b/test/linter/test_nimlsp.vader
similarity index 100%
rename from test/command_callback/test_nimlsp_command_callback.vader
rename to test/linter/test_nimlsp.vader
diff --git a/test/command_callback/test_objc_ccls_command_callbacks.vader b/test/linter/test_objc_ccls.vader
similarity index 100%
rename from test/command_callback/test_objc_ccls_command_callbacks.vader
rename to test/linter/test_objc_ccls.vader
diff --git a/test/command_callback/test_ocaml_ocamllsp_callbacks.vader b/test/linter/test_ocaml_ocamllsp.vader
similarity index 100%
rename from test/command_callback/test_ocaml_ocamllsp_callbacks.vader
rename to test/linter/test_ocaml_ocamllsp.vader
diff --git a/test/command_callback/test_ocaml_ols_callbacks.vader b/test/linter/test_ocaml_ols.vader
similarity index 100%
rename from test/command_callback/test_ocaml_ols_callbacks.vader
rename to test/linter/test_ocaml_ols.vader
diff --git a/test/command_callback/test_perl_command_callback.vader b/test/linter/test_perl.vader
similarity index 100%
rename from test/command_callback/test_perl_command_callback.vader
rename to test/linter/test_perl.vader
diff --git a/test/command_callback/test_perl6_command_callback.vader b/test/linter/test_perl6.vader
similarity index 100%
rename from test/command_callback/test_perl6_command_callback.vader
rename to test/linter/test_perl6.vader
diff --git a/test/command_callback/test_perlcritic_command_callback.vader b/test/linter/test_perlcritic.vader
similarity index 100%
rename from test/command_callback/test_perlcritic_command_callback.vader
rename to test/linter/test_perlcritic.vader
diff --git a/test/command_callback/test_php_command_callback.vader b/test/linter/test_php.vader
similarity index 100%
rename from test/command_callback/test_php_command_callback.vader
rename to test/linter/test_php.vader
diff --git a/test/command_callback/test_php_intelephense_command_callback.vader b/test/linter/test_php_intelephense.vader
similarity index 100%
rename from test/command_callback/test_php_intelephense_command_callback.vader
rename to test/linter/test_php_intelephense.vader
diff --git a/test/command_callback/test_php_langserver_callbacks.vader b/test/linter/test_php_langserver.vader
similarity index 100%
rename from test/command_callback/test_php_langserver_callbacks.vader
rename to test/linter/test_php_langserver.vader
diff --git a/test/command_callback/test_phpcs_command_callback.vader b/test/linter/test_phpcs.vader
similarity index 100%
rename from test/command_callback/test_phpcs_command_callback.vader
rename to test/linter/test_phpcs.vader
diff --git a/test/command_callback/test_phpmd_command_callbacks.vader b/test/linter/test_phpmd.vader
similarity index 100%
rename from test/command_callback/test_phpmd_command_callbacks.vader
rename to test/linter/test_phpmd.vader
diff --git a/test/command_callback/test_phpstan_command_callbacks.vader b/test/linter/test_phpstan.vader
similarity index 100%
rename from test/command_callback/test_phpstan_command_callbacks.vader
rename to test/linter/test_phpstan.vader
diff --git a/test/command_callback/test_pony_ponyc_command_callbacks.vader b/test/linter/test_pony_ponyc.vader
similarity index 100%
rename from test/command_callback/test_pony_ponyc_command_callbacks.vader
rename to test/linter/test_pony_ponyc.vader
diff --git a/test/command_callback/test_prospector_command_callback.vader b/test/linter/test_prospector.vader
similarity index 100%
rename from test/command_callback/test_prospector_command_callback.vader
rename to test/linter/test_prospector.vader
diff --git a/test/command_callback/test_proto_command_callback.vader b/test/linter/test_proto.vader
similarity index 100%
rename from test/command_callback/test_proto_command_callback.vader
rename to test/linter/test_proto.vader
diff --git a/test/command_callback/test_psalm_command_callbacks.vader b/test/linter/test_psalm.vader
similarity index 100%
rename from test/command_callback/test_psalm_command_callbacks.vader
rename to test/linter/test_psalm.vader
diff --git a/test/command_callback/test_puglint_command_callback.vader b/test/linter/test_puglint.vader
similarity index 100%
rename from test/command_callback/test_puglint_command_callback.vader
rename to test/linter/test_puglint.vader
diff --git a/test/command_callback/test_purescript_ls_command_callbacks.vader b/test/linter/test_purescript_ls.vader
similarity index 100%
rename from test/command_callback/test_purescript_ls_command_callbacks.vader
rename to test/linter/test_purescript_ls.vader
diff --git a/test/command_callback/test_pycodestyle_command_callback.vader b/test/linter/test_pycodestyle.vader
similarity index 100%
rename from test/command_callback/test_pycodestyle_command_callback.vader
rename to test/linter/test_pycodestyle.vader
diff --git a/test/command_callback/test_pydocstyle_command_callback.vader b/test/linter/test_pydocstyle.vader
similarity index 100%
rename from test/command_callback/test_pydocstyle_command_callback.vader
rename to test/linter/test_pydocstyle.vader
diff --git a/test/command_callback/test_pyflakes_command_callback.vader b/test/linter/test_pyflakes.vader
similarity index 100%
rename from test/command_callback/test_pyflakes_command_callback.vader
rename to test/linter/test_pyflakes.vader
diff --git a/test/command_callback/test_pylama_command_callback.vader b/test/linter/test_pylama.vader
similarity index 100%
rename from test/command_callback/test_pylama_command_callback.vader
rename to test/linter/test_pylama.vader
diff --git a/test/command_callback/test_pylint_command_callback.vader b/test/linter/test_pylint.vader
similarity index 100%
rename from test/command_callback/test_pylint_command_callback.vader
rename to test/linter/test_pylint.vader
diff --git a/test/command_callback/test_pyls_command_callback.vader b/test/linter/test_pyls.vader
similarity index 100%
rename from test/command_callback/test_pyls_command_callback.vader
rename to test/linter/test_pyls.vader
diff --git a/test/command_callback/test_pyre_command_callback.vader b/test/linter/test_pyre.vader
similarity index 100%
rename from test/command_callback/test_pyre_command_callback.vader
rename to test/linter/test_pyre.vader
diff --git a/test/command_callback/test_pyrex_cython_command_callback.vader b/test/linter/test_pyrex_cython.vader
similarity index 100%
rename from test/command_callback/test_pyrex_cython_command_callback.vader
rename to test/linter/test_pyrex_cython.vader
diff --git a/test/command_callback/test_pyright_command_callback.vader b/test/linter/test_pyright.vader
similarity index 100%
rename from test/command_callback/test_pyright_command_callback.vader
rename to test/linter/test_pyright.vader
diff --git a/test/command_callback/test_qmlfmt_command_callback.vader b/test/linter/test_qmlfmt.vader
similarity index 100%
rename from test/command_callback/test_qmlfmt_command_callback.vader
rename to test/linter/test_qmlfmt.vader
diff --git a/test/command_callback/test_r_languageserver_callbacks.vader b/test/linter/test_r_languageserver.vader
similarity index 100%
rename from test/command_callback/test_r_languageserver_callbacks.vader
rename to test/linter/test_r_languageserver.vader
diff --git a/test/command_callback/test_racket_raco_command_callback.vader b/test/linter/test_racket_raco.vader
similarity index 100%
rename from test/command_callback/test_racket_raco_command_callback.vader
rename to test/linter/test_racket_raco.vader
diff --git a/test/command_callback/test_rails_best_practices_command_callback.vader b/test/linter/test_rails_best_practices.vader
similarity index 100%
rename from test/command_callback/test_rails_best_practices_command_callback.vader
rename to test/linter/test_rails_best_practices.vader
diff --git a/test/command_callback/test_reason_ls_command_callback.vader b/test/linter/test_reason_ls.vader
similarity index 100%
rename from test/command_callback/test_reason_ls_command_callback.vader
rename to test/linter/test_reason_ls.vader
diff --git a/test/command_callback/test_reason_ols_callbacks.vader b/test/linter/test_reason_ols.vader
similarity index 100%
rename from test/command_callback/test_reason_ols_callbacks.vader
rename to test/linter/test_reason_ols.vader
diff --git a/test/command_callback/test_reek_command_callback.vader b/test/linter/test_reek.vader
similarity index 100%
rename from test/command_callback/test_reek_command_callback.vader
rename to test/linter/test_reek.vader
diff --git a/test/command_callback/test_remark_lint_command_callbacks.vader b/test/linter/test_remark_lint.vader
similarity index 100%
rename from test/command_callback/test_remark_lint_command_callbacks.vader
rename to test/linter/test_remark_lint.vader
diff --git a/test/command_callback/test_revive_command_callbacks.vader b/test/linter/test_revive.vader
similarity index 100%
rename from test/command_callback/test_revive_command_callbacks.vader
rename to test/linter/test_revive.vader
diff --git a/test/command_callback/test_rnix_command_callback.vader b/test/linter/test_rnix.vader
similarity index 100%
rename from test/command_callback/test_rnix_command_callback.vader
rename to test/linter/test_rnix.vader
diff --git a/test/command_callback/test_rst_textlint_command_callbacks.vader b/test/linter/test_rst_textlint.vader
similarity index 100%
rename from test/command_callback/test_rst_textlint_command_callbacks.vader
rename to test/linter/test_rst_textlint.vader
diff --git a/test/command_callback/test_rubocop_command_callback.vader b/test/linter/test_rubocop.vader
similarity index 100%
rename from test/command_callback/test_rubocop_command_callback.vader
rename to test/linter/test_rubocop.vader
diff --git a/test/command_callback/test_ruby_command_callback.vader b/test/linter/test_ruby.vader
similarity index 100%
rename from test/command_callback/test_ruby_command_callback.vader
rename to test/linter/test_ruby.vader
diff --git a/test/command_callback/test_ruby_debride_command_callback.vader b/test/linter/test_ruby_debride.vader
similarity index 100%
rename from test/command_callback/test_ruby_debride_command_callback.vader
rename to test/linter/test_ruby_debride.vader
diff --git a/test/command_callback/test_ruby_solargraph.vader b/test/linter/test_ruby_solargraph.vader
similarity index 77%
rename from test/command_callback/test_ruby_solargraph.vader
rename to test/linter/test_ruby_solargraph.vader
index e909049b..1ae67f50 100644
--- a/test/command_callback/test_ruby_solargraph.vader
+++ b/test/linter/test_ruby_solargraph.vader
@@ -1,6 +1,5 @@
 " Author: Horacio Sanson <https://github.com/hsanson>
 " Description: Tests for solargraph lsp linter.
-
 Before:
   call ale#assert#SetUpLinterTest('ruby', 'solargraph')
 
@@ -18,25 +17,25 @@ Execute(should set solargraph for rails app):
   call ale#test#SetFilename('../test-files/ruby/valid_rails_app/app/models/thing.rb')
   AssertLSPLanguage 'ruby'
   AssertLSPOptions {}
-  AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_rails_app')
+  AssertLSPProject ale#test#GetFilename('../test-files/ruby/valid_rails_app')
 
 Execute(should set solargraph for ruby app1):
   call ale#test#SetFilename('../test-files/ruby/valid_ruby_app1/lib/file.rb')
   AssertLSPLanguage 'ruby'
   AssertLSPOptions {}
-  AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_ruby_app1')
+  AssertLSPProject ale#test#GetFilename('../test-files/ruby/valid_ruby_app1')
 
 Execute(should set solargraph for ruby app2):
   call ale#test#SetFilename('../test-files/ruby/valid_ruby_app2/lib/file.rb')
   AssertLSPLanguage 'ruby'
   AssertLSPOptions {}
-  AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_ruby_app2')
+  AssertLSPProject ale#test#GetFilename('../test-files/ruby/valid_ruby_app2')
 
 Execute(should set solargraph for ruby app3):
   call ale#test#SetFilename('../test-files/ruby/valid_ruby_app3/lib/file.rb')
   AssertLSPLanguage 'ruby'
   AssertLSPOptions {}
-  AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_ruby_app3')
+  AssertLSPProject ale#test#GetFilename('../test-files/ruby/valid_ruby_app3')
 
 Execute(should accept initialization options):
   AssertLSPOptions {}
diff --git a/test/command_callback/test_rust_analyzer_callbacks.vader b/test/linter/test_rust_analyzer.vader
similarity index 100%
rename from test/command_callback/test_rust_analyzer_callbacks.vader
rename to test/linter/test_rust_analyzer.vader
diff --git a/test/command_callback/test_rust_rls_callbacks.vader b/test/linter/test_rust_rls.vader
similarity index 100%
rename from test/command_callback/test_rust_rls_callbacks.vader
rename to test/linter/test_rust_rls.vader
diff --git a/test/command_callback/test_rustc_command_callback.vader b/test/linter/test_rustc.vader
similarity index 100%
rename from test/command_callback/test_rustc_command_callback.vader
rename to test/linter/test_rustc.vader
diff --git a/test/command_callback/test_ruumba_command_callback.vader b/test/linter/test_ruumba.vader
similarity index 100%
rename from test/command_callback/test_ruumba_command_callback.vader
rename to test/linter/test_ruumba.vader
diff --git a/test/command_callback/test_sass_sasslint_command_callback.vader b/test/linter/test_sass_sasslint.vader
similarity index 100%
rename from test/command_callback/test_sass_sasslint_command_callback.vader
rename to test/linter/test_sass_sasslint.vader
diff --git a/test/command_callback/test_scala_metals.vader b/test/linter/test_scala_metals.vader
similarity index 86%
rename from test/command_callback/test_scala_metals.vader
rename to test/linter/test_scala_metals.vader
index f5733ddc..b14e3e02 100644
--- a/test/command_callback/test_scala_metals.vader
+++ b/test/linter/test_scala_metals.vader
@@ -1,17 +1,18 @@
 " Author: Jeffrey Lau https://github.com/zoonfafer
 " Description: Tests for the Scala Metals linter
-
 Before:
   call ale#assert#SetUpLinterTest('scala', 'metals')
 
 After:
   call ale#assert#TearDownLinterTest()
+
 Execute(should set metals for sbt project with build.sbt):
   call ale#test#SetFilename('../test-files/scala/valid_sbt_project/Main.scala')
   AssertLSPLanguage 'scala'
   AssertLSPOptions {}
   AssertLSPConfig {}
-  AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/scala/valid_sbt_project')
+  AssertLSPProject ale#test#GetFilename('../test-files/scala/valid_sbt_project')
+
 Execute(should not set metals for sbt project without build.sbt):
   call ale#test#SetFilename('../test-files/scala/invalid_sbt_project/Main.scala')
   AssertLSPLanguage 'scala'
diff --git a/test/command_callback/test_scala_sbtserver.vader b/test/linter/test_scala_sbtserver.vader
similarity index 87%
rename from test/command_callback/test_scala_sbtserver.vader
rename to test/linter/test_scala_sbtserver.vader
index a20c424e..118e090f 100644
--- a/test/command_callback/test_scala_sbtserver.vader
+++ b/test/linter/test_scala_sbtserver.vader
@@ -1,17 +1,19 @@
 " Author: ophirr33 <coghlan.ty@gmail.com>
 " Description: Tests for the sbt Server lsp linter
-
 Before:
   call ale#assert#SetUpLinterTest('scala', 'sbtserver')
+
 After:
   call ale#assert#TearDownLinterTest()
+
 Execute(should set sbtserver for sbt project with build.sbt):
   call ale#test#SetFilename('../test-files/scala/valid_sbt_project/Main.scala')
   AssertLSPLanguage 'scala'
   AssertLSPOptions {}
   AssertLSPConfig {}
-  AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/scala/valid_sbt_project')
+  AssertLSPProject ale#test#GetFilename('../test-files/scala/valid_sbt_project')
   AssertLSPAddress '127.0.0.1:4273'
+
 Execute(should not set sbtserver for sbt project without build.sbt):
   call ale#test#SetFilename('../test-files/scala/invalid_sbt_project/Main.scala')
   AssertLSPLanguage 'scala'
diff --git a/test/command_callback/test_scalac_command_callback.vader b/test/linter/test_scalac.vader
similarity index 100%
rename from test/command_callback/test_scalac_command_callback.vader
rename to test/linter/test_scalac.vader
diff --git a/test/command_callback/test_scalastyle_command_callback.vader b/test/linter/test_scalastyle.vader
similarity index 100%
rename from test/command_callback/test_scalastyle_command_callback.vader
rename to test/linter/test_scalastyle.vader
diff --git a/test/command_callback/test_scss_sasslint_command_callback.vader b/test/linter/test_scss_sasslint.vader
similarity index 100%
rename from test/command_callback/test_scss_sasslint_command_callback.vader
rename to test/linter/test_scss_sasslint.vader
diff --git a/test/command_callback/test_scss_stylelint_command_callback.vader b/test/linter/test_scss_stylelint.vader
similarity index 100%
rename from test/command_callback/test_scss_stylelint_command_callback.vader
rename to test/linter/test_scss_stylelint.vader
diff --git a/test/command_callback/test_shellcheck_command_callback.vader b/test/linter/test_shellcheck.vader
similarity index 100%
rename from test/command_callback/test_shellcheck_command_callback.vader
rename to test/linter/test_shellcheck.vader
diff --git a/test/command_callback/test_slimlint_command_callback.vader b/test/linter/test_slimlint.vader
similarity index 100%
rename from test/command_callback/test_slimlint_command_callback.vader
rename to test/linter/test_slimlint.vader
diff --git a/test/command_callback/test_solc_command_callback.vader b/test/linter/test_solc.vader
similarity index 100%
rename from test/command_callback/test_solc_command_callback.vader
rename to test/linter/test_solc.vader
diff --git a/test/command_callback/test_sorbet_command_callback.vader b/test/linter/test_sorbet.vader
similarity index 100%
rename from test/command_callback/test_sorbet_command_callback.vader
rename to test/linter/test_sorbet.vader
diff --git a/test/command_callback/test_spectral_command_callback.vader b/test/linter/test_spectral.vader
similarity index 100%
rename from test/command_callback/test_spectral_command_callback.vader
rename to test/linter/test_spectral.vader
diff --git a/test/command_callback/test_sqllint_command_callback.vader b/test/linter/test_sqllint.vader
similarity index 100%
rename from test/command_callback/test_sqllint_command_callback.vader
rename to test/linter/test_sqllint.vader
diff --git a/test/command_callback/test_standard_command_callback.vader b/test/linter/test_standard.vader
similarity index 100%
rename from test/command_callback/test_standard_command_callback.vader
rename to test/linter/test_standard.vader
diff --git a/test/command_callback/test_standardrb_command_callback.vader b/test/linter/test_standardrb.vader
similarity index 100%
rename from test/command_callback/test_standardrb_command_callback.vader
rename to test/linter/test_standardrb.vader
diff --git a/test/command_callback/test_standardts_command_callback.vader b/test/linter/test_standardts.vader
similarity index 100%
rename from test/command_callback/test_standardts_command_callback.vader
rename to test/linter/test_standardts.vader
diff --git a/test/command_callback/test_staticcheck_command_callback.vader b/test/linter/test_staticcheck.vader
similarity index 100%
rename from test/command_callback/test_staticcheck_command_callback.vader
rename to test/linter/test_staticcheck.vader
diff --git a/test/command_callback/test_sugarss_stylelint_command_callback.vader b/test/linter/test_sugarss_stylelint.vader
similarity index 100%
rename from test/command_callback/test_sugarss_stylelint_command_callback.vader
rename to test/linter/test_sugarss_stylelint.vader
diff --git a/test/command_callback/test_svelteserver_command_callback.vader b/test/linter/test_svelteserver.vader
similarity index 100%
rename from test/command_callback/test_svelteserver_command_callback.vader
rename to test/linter/test_svelteserver.vader
diff --git a/test/command_callback/test_swaglint_command_callback.vader b/test/linter/test_swaglint.vader
similarity index 100%
rename from test/command_callback/test_swaglint_command_callback.vader
rename to test/linter/test_swaglint.vader
diff --git a/test/command_callback/test_swift_sourcekitlsp_command_callbacks.vader b/test/linter/test_swift_sourcekitlsp.vader
similarity index 100%
rename from test/command_callback/test_swift_sourcekitlsp_command_callbacks.vader
rename to test/linter/test_swift_sourcekitlsp.vader
diff --git a/test/command_callback/test_swift_swiftformat_command_callbacks.vader b/test/linter/test_swift_swiftformat.vader
similarity index 100%
rename from test/command_callback/test_swift_swiftformat_command_callbacks.vader
rename to test/linter/test_swift_swiftformat.vader
diff --git a/test/command_callback/test_swiftlint_command_callback.vader b/test/linter/test_swiftlint.vader
similarity index 100%
rename from test/command_callback/test_swiftlint_command_callback.vader
rename to test/linter/test_swiftlint.vader
diff --git a/test/command_callback/test_systemd_analyze_command_callback.vader b/test/linter/test_systemd_analyze.vader
similarity index 100%
rename from test/command_callback/test_systemd_analyze_command_callback.vader
rename to test/linter/test_systemd_analyze.vader
diff --git a/test/command_callback/test_terraform_ls_command_callback.vader b/test/linter/test_terraform_ls.vader
similarity index 100%
rename from test/command_callback/test_terraform_ls_command_callback.vader
rename to test/linter/test_terraform_ls.vader
diff --git a/test/command_callback/test_terraform_lsp_command_callback.vader b/test/linter/test_terraform_lsp.vader
similarity index 100%
rename from test/command_callback/test_terraform_lsp_command_callback.vader
rename to test/linter/test_terraform_lsp.vader
diff --git a/test/command_callback/test_terraform_terraform_command_callback.vader b/test/linter/test_terraform_terraform.vader
similarity index 100%
rename from test/command_callback/test_terraform_terraform_command_callback.vader
rename to test/linter/test_terraform_terraform.vader
diff --git a/test/command_callback/test_terraform_tflint_command_callback.vader b/test/linter/test_terraform_tflint.vader
similarity index 100%
rename from test/command_callback/test_terraform_tflint_command_callback.vader
rename to test/linter/test_terraform_tflint.vader
diff --git a/test/command_callback/test_tex_lacheck_command_callback.vader b/test/linter/test_tex_lacheck.vader
similarity index 100%
rename from test/command_callback/test_tex_lacheck_command_callback.vader
rename to test/linter/test_tex_lacheck.vader
diff --git a/test/command_callback/test_tex_textlint_command_callbacks.vader b/test/linter/test_tex_textlint.vader
similarity index 100%
rename from test/command_callback/test_tex_textlint_command_callbacks.vader
rename to test/linter/test_tex_textlint.vader
diff --git a/test/command_callback/test_texlab_command_callbacks.vader b/test/linter/test_texlab.vader
similarity index 100%
rename from test/command_callback/test_texlab_command_callbacks.vader
rename to test/linter/test_texlab.vader
diff --git a/test/command_callback/test_textlint_command_callbacks.vader b/test/linter/test_textlint.vader
similarity index 100%
rename from test/command_callback/test_textlint_command_callbacks.vader
rename to test/linter/test_textlint.vader
diff --git a/test/command_callback/test_thrift_command_callback.vader b/test/linter/test_thrift.vader
similarity index 100%
rename from test/command_callback/test_thrift_command_callback.vader
rename to test/linter/test_thrift.vader
diff --git a/test/command_callback/test_tslint_command_callback.vader b/test/linter/test_tslint.vader
similarity index 100%
rename from test/command_callback/test_tslint_command_callback.vader
rename to test/linter/test_tslint.vader
diff --git a/test/command_callback/test_typescript_deno_lsp.vader b/test/linter/test_typescript_deno_lsp.vader
similarity index 100%
rename from test/command_callback/test_typescript_deno_lsp.vader
rename to test/linter/test_typescript_deno_lsp.vader
diff --git a/test/command_callback/test_typescript_tsserver_command_callback.vader b/test/linter/test_typescript_tsserver.vader
similarity index 100%
rename from test/command_callback/test_typescript_tsserver_command_callback.vader
rename to test/linter/test_typescript_tsserver.vader
diff --git a/test/command_callback/test_vcom_command_callbacks.vader b/test/linter/test_vcom.vader
similarity index 100%
rename from test/command_callback/test_vcom_command_callbacks.vader
rename to test/linter/test_vcom.vader
diff --git a/test/command_callback/test_verilator_command_callback.vader b/test/linter/test_verilator.vader
similarity index 100%
rename from test/command_callback/test_verilator_command_callback.vader
rename to test/linter/test_verilator.vader
diff --git a/test/command_callback/test_vim_vimls.vader b/test/linter/test_vim_vimls.vader
similarity index 100%
rename from test/command_callback/test_vim_vimls.vader
rename to test/linter/test_vim_vimls.vader
diff --git a/test/command_callback/test_vint_command_callback.vader b/test/linter/test_vint.vader
similarity index 100%
rename from test/command_callback/test_vint_command_callback.vader
rename to test/linter/test_vint.vader
diff --git a/test/command_callback/test_vlog_command_callbacks.vader b/test/linter/test_vlog.vader
similarity index 100%
rename from test/command_callback/test_vlog_command_callbacks.vader
rename to test/linter/test_vlog.vader
diff --git a/test/command_callback/test_vulture_command_callback.vader b/test/linter/test_vulture.vader
similarity index 100%
rename from test/command_callback/test_vulture_command_callback.vader
rename to test/linter/test_vulture.vader
diff --git a/test/command_callback/test_write_good_command_callback.vader b/test/linter/test_write_good.vader
similarity index 100%
rename from test/command_callback/test_write_good_command_callback.vader
rename to test/linter/test_write_good.vader
diff --git a/test/command_callback/test_xmllint_command_callback.vader b/test/linter/test_xmllint.vader
similarity index 100%
rename from test/command_callback/test_xmllint_command_callback.vader
rename to test/linter/test_xmllint.vader
diff --git a/test/command_callback/test_xo_command_callback.vader b/test/linter/test_xo.vader
similarity index 100%
rename from test/command_callback/test_xo_command_callback.vader
rename to test/linter/test_xo.vader
diff --git a/test/command_callback/test_xots_command_callback.vader b/test/linter/test_xots.vader
similarity index 100%
rename from test/command_callback/test_xots_command_callback.vader
rename to test/linter/test_xots.vader
diff --git a/test/command_callback/test_xvhdl_command_callbacks.vader b/test/linter/test_xvhdl.vader
similarity index 100%
rename from test/command_callback/test_xvhdl_command_callbacks.vader
rename to test/linter/test_xvhdl.vader
diff --git a/test/command_callback/test_xvlog_command_callbacks.vader b/test/linter/test_xvlog.vader
similarity index 100%
rename from test/command_callback/test_xvlog_command_callbacks.vader
rename to test/linter/test_xvlog.vader
diff --git a/test/command_callback/test_yang_lsp_command_callbacks.vader b/test/linter/test_yang_lsp.vader
similarity index 100%
rename from test/command_callback/test_yang_lsp_command_callbacks.vader
rename to test/linter/test_yang_lsp.vader
diff --git a/test/command_callback/test_zig_zls_callbacks.vader b/test/linter/test_zig_zls.vader
similarity index 100%
rename from test/command_callback/test_zig_zls_callbacks.vader
rename to test/linter/test_zig_zls.vader