From 6ba856daebd556ed5bf67a801c4ff17ab64ece9e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 26 Nov 2024 18:16:20 +0100
Subject: [PATCH] chore(developer): rename test files

This change rename the test files for Developer according to the
discussion at the Keyman conference in November 2024.
---
 developer/src/common/web/utils/package.json    |  2 +-
 ...-valid-email.ts => is-valid-email.tests.ts} |  0
 ...> keyman-touch-layout-file-reader.tests.ts} |  0
 ...=> keyman-touch-layout-round-trip.tests.ts} |  0
 ... => ldml-keyboard-testdata-reader.tests.ts} |  0
 ...er.ts => ldml-keyboard-xml-reader.tests.ts} |  0
 ...file-reader.ts => kpj-file-reader.tests.ts} |  0
 ...file-writer.ts => kpj-file-writer.tests.ts} |  0
 ...file-reader.ts => kps-file-reader.tests.ts} |  0
 ...k-round-trip.ts => kvk-round-trip.tests.ts} |  0
 .../{test-kvk-utils.ts => kvk-utils.tests.ts}  |  0
 .../{test-kvks-file.ts => kvks-file.tests.ts}  |  2 +-
 .../test/{test-license.ts => license.tests.ts} |  0
 .../src/common/web/utils/test/tsconfig.json    |  4 ++--
 .../{test-xml-utils.ts => xml-utils.tests.ts}  |  0
 developer/src/kmc-analyze/package.json         |  2 +-
 ...-messages.ts => analyzer-messages.tests.ts} |  0
 ...acter-use.ts => osk-character-use.tests.ts} |  0
 developer/src/kmc-analyze/test/tsconfig.json   |  4 ++--
 developer/src/kmc-copy/package.json            |  2 +-
 .../test/{test-copier.ts => copier.tests.ts}   |  0
 .../{test-messages.ts => messages.tests.ts}    |  0
 developer/src/kmc-copy/test/tsconfig.json      |  4 ++--
 developer/src/kmc-generate/package.json        |  2 +-
 ...enerator.ts => abstract-generator.tests.ts} |  0
 ...c-generator.ts => basic-generator.tests.ts} |  0
 ...r.ts => keyman-keyboard-generator.tests.ts} |  0
 ...tor.ts => ldml-keyboard-generator.tests.ts} |  0
 ...tor.ts => lexical-model-generator.tests.ts} |  0
 .../{test-messages.ts => messages.tests.ts}    |  0
 developer/src/kmc-generate/test/tsconfig.json  |  4 ++--
 developer/src/kmc-keyboard-info/package.json   |  2 +-
 ...est-font-family.ts => font-family.tests.ts} |  0
 ...> keyboard-info-compiler-messages.tests.ts} |  0
 ...iler.ts => keyboard-info-compiler.tests.ts} |  0
 .../src/kmc-keyboard-info/test/tsconfig.json   |  4 ++--
 developer/src/kmc-kmn/package.json             |  2 +-
 .../{test-compiler.ts => compiler.tests.ts}    |  0
 .../{test-features.ts => features.tests.ts}    |  0
 ...t-kmw-compiler.ts => kmw-compiler.tests.ts} |  0
 ...t-kmw-messages.ts => kmw-messages.tests.ts} |  0
 .../{test-messages.ts => messages.tests.ts}    |  0
 developer/src/kmc-kmn/test/tsconfig.json       |  4 ++--
 .../{test-wasm-uset.ts => wasm-uset.tests.ts}  |  0
 developer/src/kmc-ldml/package.json            |  2 +-
 ...t-compiler-e2e.ts => compiler-e2e.tests.ts} |  0
 ...t-dependencies.ts => dependencies.tests.ts} |  0
 .../test/{test-disp.ts => disp.tests.ts}       |  0
 .../test/{test-helpers.ts => helpers.tests.ts} |  0
 .../test/{test-keys.ts => keys.tests.ts}       |  0
 .../test/{test-layr.ts => layr.tests.ts}       |  0
 .../test/{test-linter.ts => linter.tests.ts}   |  0
 .../test/{test-loca.ts => loca.tests.ts}       |  0
 .../{test-messages.ts => messages.tests.ts}    |  0
 .../test/{test-meta.ts => meta.tests.ts}       |  0
 ...-compiler.ts => metadata-compiler.tests.ts} |  0
 .../test/{test-strs.ts => strs.tests.ts}       |  0
 ...t-testdata-e2e.ts => testdata-e2e.tests.ts} |  0
 .../test/{test-tran.ts => tran.tests.ts}       |  0
 developer/src/kmc-ldml/test/tsconfig.json      |  4 ++--
 .../test/{test-utils.ts => utils.tests.ts}     |  0
 .../test/{test-vars.ts => vars.tests.ts}       |  0
 ...er.ts => visual-keyboard-compiler.tests.ts} |  0
 developer/src/kmc-model-info/package.json      |  2 +-
 ...s => model-info-compiler-messages.tests.ts} |  0
 ...ompiler.ts => model-info-compiler.tests.ts} |  0
 .../src/kmc-model-info/test/tsconfig.json      |  4 ++--
 developer/src/kmc-model/package.json           |  2 +-
 ... compile-model-with-pseudoclosure.tests.ts} |  0
 ...compile-model.ts => compile-model.tests.ts} |  0
 ...t-compile-trie.ts => compile-trie.tests.ts} |  0
 ...ply-case.ts => default-apply-case.tests.ts} |  0
 ....ts => default-search-term-to-key.tests.ts} |  0
 ...d-breaker.ts => join-word-breaker.tests.ts} |  0
 .../{test-messages.ts => messages.tests.ts}    |  0
 ...finitions.ts => model-definitions.tests.ts} |  0
 ...ts.ts => override-script-defaults.tests.ts} |  0
 ...rse-wordlist.ts => parse-wordlist.tests.ts} |  0
 ...est-punctuation.ts => punctuation.tests.ts} |  0
 developer/src/kmc-model/test/tsconfig.json     |  4 ++--
 developer/src/kmc-package/package.json         |  2 +-
 ...p-inf-writer.ts => kmp-inf-writer.tests.ts} |  0
 .../{test-markdown.ts => markdown.tests.ts}    |  0
 .../{test-messages.ts => messages.tests.ts}    |  0
 ...e-compiler.ts => package-compiler.tests.ts} |  0
 developer/src/kmc-package/test/tsconfig.json   |  4 ++--
 ...{test-versioning.ts => versioning.tests.ts} |  0
 ...adata.ts => web-keyboard-metadata.tests.ts} |  0
 ...indows-package-installer-compiler.tests.ts} |  0
 developer/src/kmc/package.json                 |  2 +-
 .../kmc/test/{test-build.ts => build.tests.ts} |  0
 ...ons.ts => extendedCompilerOptions.tests.ts} |  0
 .../{test-fileLists.ts => fileLists.tests.ts}  |  0
 ...eyboard.ts => generateKmnKeyboard.tests.ts} |  0
 ...yboard.ts => generateLdmlKeyboard.tests.ts} |  0
 ...lModel.ts => generateLexicalModel.tests.ts} |  0
 ...itDate.ts => getLastGitCommitDate.tests.ts} |  0
 ...ages.ts => infrastructureMessages.tests.ts} |  0
 ...project-build.ts => project-build.tests.ts} |  0
 developer/src/kmc/test/tsconfig.json           |  4 ++--
 .../tests/{api-test.cpp => api.tests.cpp}      |  0
 ...piler-test.cpp => gtest-compiler.tests.cpp} |  0
 ...-km_u16-test.cpp => gtest-km_u16.tests.cpp} |  0
 .../{kmcompxtest.cpp => kmcompx.tests.cpp}     |  0
 developer/src/kmcmplib/tests/meson.build       | 18 +++++++++---------
 .../{uset-api-test.cpp => uset-api.tests.cpp}  |  0
 developer/src/server/test/tsconfig.json        |  4 ++--
 ...sion-data.test.ts => version-data.tests.ts} |  0
 108 files changed, 45 insertions(+), 45 deletions(-)
 rename developer/src/common/web/utils/test/{test-is-valid-email.ts => is-valid-email.tests.ts} (100%)
 rename developer/src/common/web/utils/test/keyman-touch-layout/{test-keyman-touch-layout-file-reader.ts => keyman-touch-layout-file-reader.tests.ts} (100%)
 rename developer/src/common/web/utils/test/keyman-touch-layout/{test-keyman-touch-layout-round-trip.ts => keyman-touch-layout-round-trip.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kmx/{test-ldml-keyboard-testdata-reader.ts => ldml-keyboard-testdata-reader.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kmx/{test-ldml-keyboard-xml-reader.ts => ldml-keyboard-xml-reader.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kpj/{test-kpj-file-reader.ts => kpj-file-reader.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kpj/{test-kpj-file-writer.ts => kpj-file-writer.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kps/{test-kps-file-reader.ts => kps-file-reader.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kvks/{test-kvk-round-trip.ts => kvk-round-trip.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kvks/{test-kvk-utils.ts => kvk-utils.tests.ts} (100%)
 rename developer/src/common/web/utils/test/kvks/{test-kvks-file.ts => kvks-file.tests.ts} (96%)
 rename developer/src/common/web/utils/test/{test-license.ts => license.tests.ts} (100%)
 rename developer/src/common/web/utils/test/{test-xml-utils.ts => xml-utils.tests.ts} (100%)
 rename developer/src/kmc-analyze/test/{test-analyzer-messages.ts => analyzer-messages.tests.ts} (100%)
 rename developer/src/kmc-analyze/test/{test-osk-character-use.ts => osk-character-use.tests.ts} (100%)
 rename developer/src/kmc-copy/test/{test-copier.ts => copier.tests.ts} (100%)
 rename developer/src/kmc-copy/test/{test-messages.ts => messages.tests.ts} (100%)
 rename developer/src/kmc-generate/test/{test-abstract-generator.ts => abstract-generator.tests.ts} (100%)
 rename developer/src/kmc-generate/test/{test-basic-generator.ts => basic-generator.tests.ts} (100%)
 rename developer/src/kmc-generate/test/{test-keyman-keyboard-generator.ts => keyman-keyboard-generator.tests.ts} (100%)
 rename developer/src/kmc-generate/test/{test-ldml-keyboard-generator.ts => ldml-keyboard-generator.tests.ts} (100%)
 rename developer/src/kmc-generate/test/{test-lexical-model-generator.ts => lexical-model-generator.tests.ts} (100%)
 rename developer/src/kmc-generate/test/{test-messages.ts => messages.tests.ts} (100%)
 rename developer/src/kmc-keyboard-info/test/{test-font-family.ts => font-family.tests.ts} (100%)
 rename developer/src/kmc-keyboard-info/test/{test-keyboard-info-compiler-messages.ts => keyboard-info-compiler-messages.tests.ts} (100%)
 rename developer/src/kmc-keyboard-info/test/{test-keyboard-info-compiler.ts => keyboard-info-compiler.tests.ts} (100%)
 rename developer/src/kmc-kmn/test/{test-compiler.ts => compiler.tests.ts} (100%)
 rename developer/src/kmc-kmn/test/{test-features.ts => features.tests.ts} (100%)
 rename developer/src/kmc-kmn/test/kmw/{test-kmw-compiler.ts => kmw-compiler.tests.ts} (100%)
 rename developer/src/kmc-kmn/test/kmw/{test-kmw-messages.ts => kmw-messages.tests.ts} (100%)
 rename developer/src/kmc-kmn/test/{test-messages.ts => messages.tests.ts} (100%)
 rename developer/src/kmc-kmn/test/{test-wasm-uset.ts => wasm-uset.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-compiler-e2e.ts => compiler-e2e.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-dependencies.ts => dependencies.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-disp.ts => disp.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-helpers.ts => helpers.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-keys.ts => keys.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-layr.ts => layr.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-linter.ts => linter.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-loca.ts => loca.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-messages.ts => messages.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-meta.ts => meta.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-metadata-compiler.ts => metadata-compiler.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-strs.ts => strs.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-testdata-e2e.ts => testdata-e2e.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-tran.ts => tran.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-utils.ts => utils.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-vars.ts => vars.tests.ts} (100%)
 rename developer/src/kmc-ldml/test/{test-visual-keyboard-compiler.ts => visual-keyboard-compiler.tests.ts} (100%)
 rename developer/src/kmc-model-info/test/{test-model-info-compiler-messages.ts => model-info-compiler-messages.tests.ts} (100%)
 rename developer/src/kmc-model-info/test/{test-model-info-compiler.ts => model-info-compiler.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-compile-model-with-pseudoclosure.ts => compile-model-with-pseudoclosure.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-compile-model.ts => compile-model.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-compile-trie.ts => compile-trie.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-default-apply-case.ts => default-apply-case.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-default-search-term-to-key.ts => default-search-term-to-key.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-join-word-breaker.ts => join-word-breaker.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-messages.ts => messages.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-model-definitions.ts => model-definitions.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-override-script-defaults.ts => override-script-defaults.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-parse-wordlist.ts => parse-wordlist.tests.ts} (100%)
 rename developer/src/kmc-model/test/{test-punctuation.ts => punctuation.tests.ts} (100%)
 rename developer/src/kmc-package/test/{test-kmp-inf-writer.ts => kmp-inf-writer.tests.ts} (100%)
 rename developer/src/kmc-package/test/{test-markdown.ts => markdown.tests.ts} (100%)
 rename developer/src/kmc-package/test/{test-messages.ts => messages.tests.ts} (100%)
 rename developer/src/kmc-package/test/{test-package-compiler.ts => package-compiler.tests.ts} (100%)
 rename developer/src/kmc-package/test/{test-versioning.ts => versioning.tests.ts} (100%)
 rename developer/src/kmc-package/test/{test-web-keyboard-metadata.ts => web-keyboard-metadata.tests.ts} (100%)
 rename developer/src/kmc-package/test/{test-windows-package-installer-compiler.ts => windows-package-installer-compiler.tests.ts} (100%)
 rename developer/src/kmc/test/{test-build.ts => build.tests.ts} (100%)
 rename developer/src/kmc/test/{test-extendedCompilerOptions.ts => extendedCompilerOptions.tests.ts} (100%)
 rename developer/src/kmc/test/{test-fileLists.ts => fileLists.tests.ts} (100%)
 rename developer/src/kmc/test/{test-generateKmnKeyboard.ts => generateKmnKeyboard.tests.ts} (100%)
 rename developer/src/kmc/test/{test-generateLdmlKeyboard.ts => generateLdmlKeyboard.tests.ts} (100%)
 rename developer/src/kmc/test/{test-generateLexicalModel.ts => generateLexicalModel.tests.ts} (100%)
 rename developer/src/kmc/test/{test-getLastGitCommitDate.ts => getLastGitCommitDate.tests.ts} (100%)
 rename developer/src/kmc/test/{test-infrastructureMessages.ts => infrastructureMessages.tests.ts} (100%)
 rename developer/src/kmc/test/{test-project-build.ts => project-build.tests.ts} (100%)
 rename developer/src/kmcmplib/tests/{api-test.cpp => api.tests.cpp} (100%)
 rename developer/src/kmcmplib/tests/{gtest-compiler-test.cpp => gtest-compiler.tests.cpp} (100%)
 rename developer/src/kmcmplib/tests/{gtest-km_u16-test.cpp => gtest-km_u16.tests.cpp} (100%)
 rename developer/src/kmcmplib/tests/{kmcompxtest.cpp => kmcompx.tests.cpp} (100%)
 rename developer/src/kmcmplib/tests/{uset-api-test.cpp => uset-api.tests.cpp} (100%)
 rename developer/src/server/test/{version-data.test.ts => version-data.tests.ts} (100%)

diff --git a/developer/src/common/web/utils/package.json b/developer/src/common/web/utils/package.json
index 7500db9259d..4f066313f6d 100644
--- a/developer/src/common/web/utils/package.json
+++ b/developer/src/common/web/utils/package.json
@@ -33,7 +33,7 @@
     "build": "tsc -b"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/common/web/utils/test/test-is-valid-email.ts b/developer/src/common/web/utils/test/is-valid-email.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/test-is-valid-email.ts
rename to developer/src/common/web/utils/test/is-valid-email.tests.ts
diff --git a/developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts b/developer/src/common/web/utils/test/keyman-touch-layout/keyman-touch-layout-file-reader.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-file-reader.ts
rename to developer/src/common/web/utils/test/keyman-touch-layout/keyman-touch-layout-file-reader.tests.ts
diff --git a/developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts b/developer/src/common/web/utils/test/keyman-touch-layout/keyman-touch-layout-round-trip.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/keyman-touch-layout/test-keyman-touch-layout-round-trip.ts
rename to developer/src/common/web/utils/test/keyman-touch-layout/keyman-touch-layout-round-trip.tests.ts
diff --git a/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-testdata-reader.ts b/developer/src/common/web/utils/test/kmx/ldml-keyboard-testdata-reader.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/kmx/test-ldml-keyboard-testdata-reader.ts
rename to developer/src/common/web/utils/test/kmx/ldml-keyboard-testdata-reader.tests.ts
diff --git a/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts b/developer/src/common/web/utils/test/kmx/ldml-keyboard-xml-reader.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts
rename to developer/src/common/web/utils/test/kmx/ldml-keyboard-xml-reader.tests.ts
diff --git a/developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts b/developer/src/common/web/utils/test/kpj/kpj-file-reader.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts
rename to developer/src/common/web/utils/test/kpj/kpj-file-reader.tests.ts
diff --git a/developer/src/common/web/utils/test/kpj/test-kpj-file-writer.ts b/developer/src/common/web/utils/test/kpj/kpj-file-writer.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/kpj/test-kpj-file-writer.ts
rename to developer/src/common/web/utils/test/kpj/kpj-file-writer.tests.ts
diff --git a/developer/src/common/web/utils/test/kps/test-kps-file-reader.ts b/developer/src/common/web/utils/test/kps/kps-file-reader.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/kps/test-kps-file-reader.ts
rename to developer/src/common/web/utils/test/kps/kps-file-reader.tests.ts
diff --git a/developer/src/common/web/utils/test/kvks/test-kvk-round-trip.ts b/developer/src/common/web/utils/test/kvks/kvk-round-trip.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/kvks/test-kvk-round-trip.ts
rename to developer/src/common/web/utils/test/kvks/kvk-round-trip.tests.ts
diff --git a/developer/src/common/web/utils/test/kvks/test-kvk-utils.ts b/developer/src/common/web/utils/test/kvks/kvk-utils.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/kvks/test-kvk-utils.ts
rename to developer/src/common/web/utils/test/kvks/kvk-utils.tests.ts
diff --git a/developer/src/common/web/utils/test/kvks/test-kvks-file.ts b/developer/src/common/web/utils/test/kvks/kvks-file.tests.ts
similarity index 96%
rename from developer/src/common/web/utils/test/kvks/test-kvks-file.ts
rename to developer/src/common/web/utils/test/kvks/kvks-file.tests.ts
index 80851647bd1..4c009e9d5c8 100644
--- a/developer/src/common/web/utils/test/kvks/test-kvks-file.ts
+++ b/developer/src/common/web/utils/test/kvks/kvks-file.tests.ts
@@ -3,7 +3,7 @@ import 'mocha';
 import { makePathToFixture } from '../helpers/index.js';
 import KvksFileReader from "../../src/types/kvks/kvks-file-reader.js";
 import KvksFileWriter from "../../src/types/kvks/kvks-file-writer.js";
-import { verify_khmer_angkor, verify_balochi_inpage } from './test-kvk-utils.js';
+import { verify_khmer_angkor, verify_balochi_inpage } from './kvk-utils.tests.js';
 import { assert } from 'chai';
 
 describe('kvks-file-reader', function() {
diff --git a/developer/src/common/web/utils/test/test-license.ts b/developer/src/common/web/utils/test/license.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/test-license.ts
rename to developer/src/common/web/utils/test/license.tests.ts
diff --git a/developer/src/common/web/utils/test/tsconfig.json b/developer/src/common/web/utils/test/tsconfig.json
index fdf5fd474f9..8ba9ac76686 100644
--- a/developer/src/common/web/utils/test/tsconfig.json
+++ b/developer/src/common/web/utils/test/tsconfig.json
@@ -11,11 +11,11 @@
       "baseUrl": ".",
   },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "helpers/*.ts",
   ],
   "references": [
       { "path": "../" },
       { "path": "../../test-helpers/" },
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/common/web/utils/test/test-xml-utils.ts b/developer/src/common/web/utils/test/xml-utils.tests.ts
similarity index 100%
rename from developer/src/common/web/utils/test/test-xml-utils.ts
rename to developer/src/common/web/utils/test/xml-utils.tests.ts
diff --git a/developer/src/kmc-analyze/package.json b/developer/src/kmc-analyze/package.json
index 6299bf3a58c..3d31dc04dde 100644
--- a/developer/src/kmc-analyze/package.json
+++ b/developer/src/kmc-analyze/package.json
@@ -37,7 +37,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-analyze/test/test-analyzer-messages.ts b/developer/src/kmc-analyze/test/analyzer-messages.tests.ts
similarity index 100%
rename from developer/src/kmc-analyze/test/test-analyzer-messages.ts
rename to developer/src/kmc-analyze/test/analyzer-messages.tests.ts
diff --git a/developer/src/kmc-analyze/test/test-osk-character-use.ts b/developer/src/kmc-analyze/test/osk-character-use.tests.ts
similarity index 100%
rename from developer/src/kmc-analyze/test/test-osk-character-use.ts
rename to developer/src/kmc-analyze/test/osk-character-use.tests.ts
diff --git a/developer/src/kmc-analyze/test/tsconfig.json b/developer/src/kmc-analyze/test/tsconfig.json
index 01cc026dc10..9a452068536 100644
--- a/developer/src/kmc-analyze/test/tsconfig.json
+++ b/developer/src/kmc-analyze/test/tsconfig.json
@@ -8,11 +8,11 @@
       "baseUrl": ".",
   },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "helpers/*.ts",
   ],
   "references": [
       { "path": "../" },
       { "path": "../../common/web/test-helpers/" },
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-copy/package.json b/developer/src/kmc-copy/package.json
index 9c90b345c71..35e587b5a3b 100644
--- a/developer/src/kmc-copy/package.json
+++ b/developer/src/kmc-copy/package.json
@@ -41,7 +41,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-copy/test/test-copier.ts b/developer/src/kmc-copy/test/copier.tests.ts
similarity index 100%
rename from developer/src/kmc-copy/test/test-copier.ts
rename to developer/src/kmc-copy/test/copier.tests.ts
diff --git a/developer/src/kmc-copy/test/test-messages.ts b/developer/src/kmc-copy/test/messages.tests.ts
similarity index 100%
rename from developer/src/kmc-copy/test/test-messages.ts
rename to developer/src/kmc-copy/test/messages.tests.ts
diff --git a/developer/src/kmc-copy/test/tsconfig.json b/developer/src/kmc-copy/test/tsconfig.json
index 145099305d2..40f1dcb8cdc 100644
--- a/developer/src/kmc-copy/test/tsconfig.json
+++ b/developer/src/kmc-copy/test/tsconfig.json
@@ -15,7 +15,7 @@
       },
     },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "./shared-options.ts",
       "./helpers/index.ts"
   ],
@@ -25,4 +25,4 @@
       { "path": "../../common/web/test-helpers/" },
       { "path": "../" }
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-generate/package.json b/developer/src/kmc-generate/package.json
index 34eb2b4ebeb..a8e0810338f 100644
--- a/developer/src/kmc-generate/package.json
+++ b/developer/src/kmc-generate/package.json
@@ -41,7 +41,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-generate/test/test-abstract-generator.ts b/developer/src/kmc-generate/test/abstract-generator.tests.ts
similarity index 100%
rename from developer/src/kmc-generate/test/test-abstract-generator.ts
rename to developer/src/kmc-generate/test/abstract-generator.tests.ts
diff --git a/developer/src/kmc-generate/test/test-basic-generator.ts b/developer/src/kmc-generate/test/basic-generator.tests.ts
similarity index 100%
rename from developer/src/kmc-generate/test/test-basic-generator.ts
rename to developer/src/kmc-generate/test/basic-generator.tests.ts
diff --git a/developer/src/kmc-generate/test/test-keyman-keyboard-generator.ts b/developer/src/kmc-generate/test/keyman-keyboard-generator.tests.ts
similarity index 100%
rename from developer/src/kmc-generate/test/test-keyman-keyboard-generator.ts
rename to developer/src/kmc-generate/test/keyman-keyboard-generator.tests.ts
diff --git a/developer/src/kmc-generate/test/test-ldml-keyboard-generator.ts b/developer/src/kmc-generate/test/ldml-keyboard-generator.tests.ts
similarity index 100%
rename from developer/src/kmc-generate/test/test-ldml-keyboard-generator.ts
rename to developer/src/kmc-generate/test/ldml-keyboard-generator.tests.ts
diff --git a/developer/src/kmc-generate/test/test-lexical-model-generator.ts b/developer/src/kmc-generate/test/lexical-model-generator.tests.ts
similarity index 100%
rename from developer/src/kmc-generate/test/test-lexical-model-generator.ts
rename to developer/src/kmc-generate/test/lexical-model-generator.tests.ts
diff --git a/developer/src/kmc-generate/test/test-messages.ts b/developer/src/kmc-generate/test/messages.tests.ts
similarity index 100%
rename from developer/src/kmc-generate/test/test-messages.ts
rename to developer/src/kmc-generate/test/messages.tests.ts
diff --git a/developer/src/kmc-generate/test/tsconfig.json b/developer/src/kmc-generate/test/tsconfig.json
index 6cbb24ae0ff..122255b8241 100644
--- a/developer/src/kmc-generate/test/tsconfig.json
+++ b/developer/src/kmc-generate/test/tsconfig.json
@@ -15,7 +15,7 @@
       },
     },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "./shared-options.ts",
       "./helpers/index.ts"
   ],
@@ -25,4 +25,4 @@
       { "path": "../../common/web/test-helpers/" },
       { "path": "../" }
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-keyboard-info/package.json b/developer/src/kmc-keyboard-info/package.json
index 4d4a4210257..45e1001501c 100644
--- a/developer/src/kmc-keyboard-info/package.json
+++ b/developer/src/kmc-keyboard-info/package.json
@@ -36,7 +36,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-keyboard-info/test/test-font-family.ts b/developer/src/kmc-keyboard-info/test/font-family.tests.ts
similarity index 100%
rename from developer/src/kmc-keyboard-info/test/test-font-family.ts
rename to developer/src/kmc-keyboard-info/test/font-family.tests.ts
diff --git a/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler-messages.ts b/developer/src/kmc-keyboard-info/test/keyboard-info-compiler-messages.tests.ts
similarity index 100%
rename from developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler-messages.ts
rename to developer/src/kmc-keyboard-info/test/keyboard-info-compiler-messages.tests.ts
diff --git a/developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler.ts b/developer/src/kmc-keyboard-info/test/keyboard-info-compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler.ts
rename to developer/src/kmc-keyboard-info/test/keyboard-info-compiler.tests.ts
diff --git a/developer/src/kmc-keyboard-info/test/tsconfig.json b/developer/src/kmc-keyboard-info/test/tsconfig.json
index e16b935aa47..2d85e0fcbdb 100644
--- a/developer/src/kmc-keyboard-info/test/tsconfig.json
+++ b/developer/src/kmc-keyboard-info/test/tsconfig.json
@@ -10,7 +10,7 @@
       "baseUrl": ".",
   },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "helpers/*.ts",
   ],
   "references": [
@@ -18,4 +18,4 @@
       { "path": "../../common/web/test-helpers/" },
       { "path": "../../kmc-package/" },
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-kmn/package.json b/developer/src/kmc-kmn/package.json
index fc9470a6bce..1f5b8bbe9ba 100644
--- a/developer/src/kmc-kmn/package.json
+++ b/developer/src/kmc-kmn/package.json
@@ -44,7 +44,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-kmn/test/test-compiler.ts b/developer/src/kmc-kmn/test/compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-kmn/test/test-compiler.ts
rename to developer/src/kmc-kmn/test/compiler.tests.ts
diff --git a/developer/src/kmc-kmn/test/test-features.ts b/developer/src/kmc-kmn/test/features.tests.ts
similarity index 100%
rename from developer/src/kmc-kmn/test/test-features.ts
rename to developer/src/kmc-kmn/test/features.tests.ts
diff --git a/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts b/developer/src/kmc-kmn/test/kmw/kmw-compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts
rename to developer/src/kmc-kmn/test/kmw/kmw-compiler.tests.ts
diff --git a/developer/src/kmc-kmn/test/kmw/test-kmw-messages.ts b/developer/src/kmc-kmn/test/kmw/kmw-messages.tests.ts
similarity index 100%
rename from developer/src/kmc-kmn/test/kmw/test-kmw-messages.ts
rename to developer/src/kmc-kmn/test/kmw/kmw-messages.tests.ts
diff --git a/developer/src/kmc-kmn/test/test-messages.ts b/developer/src/kmc-kmn/test/messages.tests.ts
similarity index 100%
rename from developer/src/kmc-kmn/test/test-messages.ts
rename to developer/src/kmc-kmn/test/messages.tests.ts
diff --git a/developer/src/kmc-kmn/test/tsconfig.json b/developer/src/kmc-kmn/test/tsconfig.json
index 3737f8d2ac6..dee653dfac4 100644
--- a/developer/src/kmc-kmn/test/tsconfig.json
+++ b/developer/src/kmc-kmn/test/tsconfig.json
@@ -9,7 +9,7 @@
       "allowSyntheticDefaultImports": true, // for chai
     },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "./helpers/index.ts",
       "./kmw/util.ts"
   ],
@@ -20,4 +20,4 @@
       { "path": "../../common/web/test-helpers/" },
       { "path": "../" }
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-kmn/test/test-wasm-uset.ts b/developer/src/kmc-kmn/test/wasm-uset.tests.ts
similarity index 100%
rename from developer/src/kmc-kmn/test/test-wasm-uset.ts
rename to developer/src/kmc-kmn/test/wasm-uset.tests.ts
diff --git a/developer/src/kmc-ldml/package.json b/developer/src/kmc-ldml/package.json
index 11d7c07b880..cecbc8e15b8 100644
--- a/developer/src/kmc-ldml/package.json
+++ b/developer/src/kmc-ldml/package.json
@@ -45,7 +45,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-ldml/test/test-compiler-e2e.ts b/developer/src/kmc-ldml/test/compiler-e2e.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-compiler-e2e.ts
rename to developer/src/kmc-ldml/test/compiler-e2e.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-dependencies.ts b/developer/src/kmc-ldml/test/dependencies.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-dependencies.ts
rename to developer/src/kmc-ldml/test/dependencies.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-disp.ts b/developer/src/kmc-ldml/test/disp.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-disp.ts
rename to developer/src/kmc-ldml/test/disp.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-helpers.ts b/developer/src/kmc-ldml/test/helpers.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-helpers.ts
rename to developer/src/kmc-ldml/test/helpers.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-keys.ts b/developer/src/kmc-ldml/test/keys.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-keys.ts
rename to developer/src/kmc-ldml/test/keys.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-layr.ts b/developer/src/kmc-ldml/test/layr.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-layr.ts
rename to developer/src/kmc-ldml/test/layr.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-linter.ts b/developer/src/kmc-ldml/test/linter.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-linter.ts
rename to developer/src/kmc-ldml/test/linter.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-loca.ts b/developer/src/kmc-ldml/test/loca.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-loca.ts
rename to developer/src/kmc-ldml/test/loca.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-messages.ts b/developer/src/kmc-ldml/test/messages.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-messages.ts
rename to developer/src/kmc-ldml/test/messages.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-meta.ts b/developer/src/kmc-ldml/test/meta.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-meta.ts
rename to developer/src/kmc-ldml/test/meta.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-metadata-compiler.ts b/developer/src/kmc-ldml/test/metadata-compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-metadata-compiler.ts
rename to developer/src/kmc-ldml/test/metadata-compiler.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-strs.ts b/developer/src/kmc-ldml/test/strs.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-strs.ts
rename to developer/src/kmc-ldml/test/strs.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-testdata-e2e.ts b/developer/src/kmc-ldml/test/testdata-e2e.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-testdata-e2e.ts
rename to developer/src/kmc-ldml/test/testdata-e2e.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-tran.ts b/developer/src/kmc-ldml/test/tran.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-tran.ts
rename to developer/src/kmc-ldml/test/tran.tests.ts
diff --git a/developer/src/kmc-ldml/test/tsconfig.json b/developer/src/kmc-ldml/test/tsconfig.json
index cda71853604..354f5235f1b 100644
--- a/developer/src/kmc-ldml/test/tsconfig.json
+++ b/developer/src/kmc-ldml/test/tsconfig.json
@@ -9,7 +9,7 @@
       "strictNullChecks": false, // TODO: get rid of this as some point
     },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "./helpers/index.ts"
   ],
   "references": [
@@ -19,4 +19,4 @@
       { "path": "../../common/web/test-helpers/" },
       { "path": "../" }
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-ldml/test/test-utils.ts b/developer/src/kmc-ldml/test/utils.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-utils.ts
rename to developer/src/kmc-ldml/test/utils.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-vars.ts b/developer/src/kmc-ldml/test/vars.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-vars.ts
rename to developer/src/kmc-ldml/test/vars.tests.ts
diff --git a/developer/src/kmc-ldml/test/test-visual-keyboard-compiler.ts b/developer/src/kmc-ldml/test/visual-keyboard-compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-ldml/test/test-visual-keyboard-compiler.ts
rename to developer/src/kmc-ldml/test/visual-keyboard-compiler.tests.ts
diff --git a/developer/src/kmc-model-info/package.json b/developer/src/kmc-model-info/package.json
index 20be72d1899..7613afae554 100644
--- a/developer/src/kmc-model-info/package.json
+++ b/developer/src/kmc-model-info/package.json
@@ -43,7 +43,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-model-info/test/test-model-info-compiler-messages.ts b/developer/src/kmc-model-info/test/model-info-compiler-messages.tests.ts
similarity index 100%
rename from developer/src/kmc-model-info/test/test-model-info-compiler-messages.ts
rename to developer/src/kmc-model-info/test/model-info-compiler-messages.tests.ts
diff --git a/developer/src/kmc-model-info/test/test-model-info-compiler.ts b/developer/src/kmc-model-info/test/model-info-compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-model-info/test/test-model-info-compiler.ts
rename to developer/src/kmc-model-info/test/model-info-compiler.tests.ts
diff --git a/developer/src/kmc-model-info/test/tsconfig.json b/developer/src/kmc-model-info/test/tsconfig.json
index e16b935aa47..2d85e0fcbdb 100644
--- a/developer/src/kmc-model-info/test/tsconfig.json
+++ b/developer/src/kmc-model-info/test/tsconfig.json
@@ -10,7 +10,7 @@
       "baseUrl": ".",
   },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "helpers/*.ts",
   ],
   "references": [
@@ -18,4 +18,4 @@
       { "path": "../../common/web/test-helpers/" },
       { "path": "../../kmc-package/" },
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-model/package.json b/developer/src/kmc-model/package.json
index 9f95de51f8d..ec6a83471ae 100644
--- a/developer/src/kmc-model/package.json
+++ b/developer/src/kmc-model/package.json
@@ -46,7 +46,7 @@
     "mocha": "^10.0.0"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-model/test/test-compile-model-with-pseudoclosure.ts b/developer/src/kmc-model/test/compile-model-with-pseudoclosure.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-compile-model-with-pseudoclosure.ts
rename to developer/src/kmc-model/test/compile-model-with-pseudoclosure.tests.ts
diff --git a/developer/src/kmc-model/test/test-compile-model.ts b/developer/src/kmc-model/test/compile-model.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-compile-model.ts
rename to developer/src/kmc-model/test/compile-model.tests.ts
diff --git a/developer/src/kmc-model/test/test-compile-trie.ts b/developer/src/kmc-model/test/compile-trie.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-compile-trie.ts
rename to developer/src/kmc-model/test/compile-trie.tests.ts
diff --git a/developer/src/kmc-model/test/test-default-apply-case.ts b/developer/src/kmc-model/test/default-apply-case.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-default-apply-case.ts
rename to developer/src/kmc-model/test/default-apply-case.tests.ts
diff --git a/developer/src/kmc-model/test/test-default-search-term-to-key.ts b/developer/src/kmc-model/test/default-search-term-to-key.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-default-search-term-to-key.ts
rename to developer/src/kmc-model/test/default-search-term-to-key.tests.ts
diff --git a/developer/src/kmc-model/test/test-join-word-breaker.ts b/developer/src/kmc-model/test/join-word-breaker.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-join-word-breaker.ts
rename to developer/src/kmc-model/test/join-word-breaker.tests.ts
diff --git a/developer/src/kmc-model/test/test-messages.ts b/developer/src/kmc-model/test/messages.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-messages.ts
rename to developer/src/kmc-model/test/messages.tests.ts
diff --git a/developer/src/kmc-model/test/test-model-definitions.ts b/developer/src/kmc-model/test/model-definitions.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-model-definitions.ts
rename to developer/src/kmc-model/test/model-definitions.tests.ts
diff --git a/developer/src/kmc-model/test/test-override-script-defaults.ts b/developer/src/kmc-model/test/override-script-defaults.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-override-script-defaults.ts
rename to developer/src/kmc-model/test/override-script-defaults.tests.ts
diff --git a/developer/src/kmc-model/test/test-parse-wordlist.ts b/developer/src/kmc-model/test/parse-wordlist.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-parse-wordlist.ts
rename to developer/src/kmc-model/test/parse-wordlist.tests.ts
diff --git a/developer/src/kmc-model/test/test-punctuation.ts b/developer/src/kmc-model/test/punctuation.tests.ts
similarity index 100%
rename from developer/src/kmc-model/test/test-punctuation.ts
rename to developer/src/kmc-model/test/punctuation.tests.ts
diff --git a/developer/src/kmc-model/test/tsconfig.json b/developer/src/kmc-model/test/tsconfig.json
index 1b1ca1668f6..e30096ba96a 100644
--- a/developer/src/kmc-model/test/tsconfig.json
+++ b/developer/src/kmc-model/test/tsconfig.json
@@ -10,7 +10,7 @@
       "baseUrl": ".",
   },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "*.ts",
       "helpers/*.ts",
       "wordbreakers/*.ts"
@@ -19,4 +19,4 @@
       { "path": "../" },
       { "path": "../../common/web/test-helpers/" },
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-package/package.json b/developer/src/kmc-package/package.json
index 521ae02e44b..93525e73303 100644
--- a/developer/src/kmc-package/package.json
+++ b/developer/src/kmc-package/package.json
@@ -44,7 +44,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc-package/test/test-kmp-inf-writer.ts b/developer/src/kmc-package/test/kmp-inf-writer.tests.ts
similarity index 100%
rename from developer/src/kmc-package/test/test-kmp-inf-writer.ts
rename to developer/src/kmc-package/test/kmp-inf-writer.tests.ts
diff --git a/developer/src/kmc-package/test/test-markdown.ts b/developer/src/kmc-package/test/markdown.tests.ts
similarity index 100%
rename from developer/src/kmc-package/test/test-markdown.ts
rename to developer/src/kmc-package/test/markdown.tests.ts
diff --git a/developer/src/kmc-package/test/test-messages.ts b/developer/src/kmc-package/test/messages.tests.ts
similarity index 100%
rename from developer/src/kmc-package/test/test-messages.ts
rename to developer/src/kmc-package/test/messages.tests.ts
diff --git a/developer/src/kmc-package/test/test-package-compiler.ts b/developer/src/kmc-package/test/package-compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-package/test/test-package-compiler.ts
rename to developer/src/kmc-package/test/package-compiler.tests.ts
diff --git a/developer/src/kmc-package/test/tsconfig.json b/developer/src/kmc-package/test/tsconfig.json
index 62904114c8b..fe3f8f22eaa 100644
--- a/developer/src/kmc-package/test/tsconfig.json
+++ b/developer/src/kmc-package/test/tsconfig.json
@@ -9,7 +9,7 @@
       "allowSyntheticDefaultImports": true, // for jszip
     },
   "include": [
-      "**/test-*.ts",
+      "**/*.tests.ts",
       "helpers/*.ts"
   ],
   "references": [
@@ -18,4 +18,4 @@
       { "path": "../../../../common/web/keyman-version" },
       { "path": "../../common/web/test-helpers/" },
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-package/test/test-versioning.ts b/developer/src/kmc-package/test/versioning.tests.ts
similarity index 100%
rename from developer/src/kmc-package/test/test-versioning.ts
rename to developer/src/kmc-package/test/versioning.tests.ts
diff --git a/developer/src/kmc-package/test/test-web-keyboard-metadata.ts b/developer/src/kmc-package/test/web-keyboard-metadata.tests.ts
similarity index 100%
rename from developer/src/kmc-package/test/test-web-keyboard-metadata.ts
rename to developer/src/kmc-package/test/web-keyboard-metadata.tests.ts
diff --git a/developer/src/kmc-package/test/test-windows-package-installer-compiler.ts b/developer/src/kmc-package/test/windows-package-installer-compiler.tests.ts
similarity index 100%
rename from developer/src/kmc-package/test/test-windows-package-installer-compiler.ts
rename to developer/src/kmc-package/test/windows-package-installer-compiler.tests.ts
diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json
index ccc4e950d8c..1a1a3e0e953 100644
--- a/developer/src/kmc/package.json
+++ b/developer/src/kmc/package.json
@@ -65,7 +65,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/test/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
diff --git a/developer/src/kmc/test/test-build.ts b/developer/src/kmc/test/build.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-build.ts
rename to developer/src/kmc/test/build.tests.ts
diff --git a/developer/src/kmc/test/test-extendedCompilerOptions.ts b/developer/src/kmc/test/extendedCompilerOptions.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-extendedCompilerOptions.ts
rename to developer/src/kmc/test/extendedCompilerOptions.tests.ts
diff --git a/developer/src/kmc/test/test-fileLists.ts b/developer/src/kmc/test/fileLists.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-fileLists.ts
rename to developer/src/kmc/test/fileLists.tests.ts
diff --git a/developer/src/kmc/test/test-generateKmnKeyboard.ts b/developer/src/kmc/test/generateKmnKeyboard.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-generateKmnKeyboard.ts
rename to developer/src/kmc/test/generateKmnKeyboard.tests.ts
diff --git a/developer/src/kmc/test/test-generateLdmlKeyboard.ts b/developer/src/kmc/test/generateLdmlKeyboard.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-generateLdmlKeyboard.ts
rename to developer/src/kmc/test/generateLdmlKeyboard.tests.ts
diff --git a/developer/src/kmc/test/test-generateLexicalModel.ts b/developer/src/kmc/test/generateLexicalModel.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-generateLexicalModel.ts
rename to developer/src/kmc/test/generateLexicalModel.tests.ts
diff --git a/developer/src/kmc/test/test-getLastGitCommitDate.ts b/developer/src/kmc/test/getLastGitCommitDate.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-getLastGitCommitDate.ts
rename to developer/src/kmc/test/getLastGitCommitDate.tests.ts
diff --git a/developer/src/kmc/test/test-infrastructureMessages.ts b/developer/src/kmc/test/infrastructureMessages.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-infrastructureMessages.ts
rename to developer/src/kmc/test/infrastructureMessages.tests.ts
diff --git a/developer/src/kmc/test/test-project-build.ts b/developer/src/kmc/test/project-build.tests.ts
similarity index 100%
rename from developer/src/kmc/test/test-project-build.ts
rename to developer/src/kmc/test/project-build.tests.ts
diff --git a/developer/src/kmc/test/tsconfig.json b/developer/src/kmc/test/tsconfig.json
index 3d0d6eb4f6c..32419a8e57c 100644
--- a/developer/src/kmc/test/tsconfig.json
+++ b/developer/src/kmc/test/tsconfig.json
@@ -8,7 +8,7 @@
     "baseUrl": ".",
   },
   "include": [
-    "**/test-*.ts",
+    "**/*.tests.ts",
     "./helpers/index.ts",
   ],
   "references": [
@@ -16,4 +16,4 @@
     { "path": "../../common/web/test-helpers/" },
     { "path": "../" }
   ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmcmplib/tests/api-test.cpp b/developer/src/kmcmplib/tests/api.tests.cpp
similarity index 100%
rename from developer/src/kmcmplib/tests/api-test.cpp
rename to developer/src/kmcmplib/tests/api.tests.cpp
diff --git a/developer/src/kmcmplib/tests/gtest-compiler-test.cpp b/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
similarity index 100%
rename from developer/src/kmcmplib/tests/gtest-compiler-test.cpp
rename to developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
diff --git a/developer/src/kmcmplib/tests/gtest-km_u16-test.cpp b/developer/src/kmcmplib/tests/gtest-km_u16.tests.cpp
similarity index 100%
rename from developer/src/kmcmplib/tests/gtest-km_u16-test.cpp
rename to developer/src/kmcmplib/tests/gtest-km_u16.tests.cpp
diff --git a/developer/src/kmcmplib/tests/kmcompxtest.cpp b/developer/src/kmcmplib/tests/kmcompx.tests.cpp
similarity index 100%
rename from developer/src/kmcmplib/tests/kmcompxtest.cpp
rename to developer/src/kmcmplib/tests/kmcompx.tests.cpp
diff --git a/developer/src/kmcmplib/tests/meson.build b/developer/src/kmcmplib/tests/meson.build
index 65915d1e9d9..fafed5f1f6f 100644
--- a/developer/src/kmcmplib/tests/meson.build
+++ b/developer/src/kmcmplib/tests/meson.build
@@ -15,7 +15,7 @@ endif
 input_path = meson.current_source_dir() / '../../../../common/test/keyboards/baseline'
 output_path = meson.current_build_dir()
 
-kmcompxtest = executable('kmcompxtest', ['kmcompxtest.cpp','util_filesystem.cpp','util_callbacks.cpp'],
+kmcompxtest = executable('kmcompxtests', ['kmcompx.tests.cpp','util_filesystem.cpp','util_callbacks.cpp'],
     cpp_args: defns + flags,
     include_directories: inc,
     name_suffix: name_suffix,
@@ -133,7 +133,7 @@ common_test_files = [ meson.global_source_root() / '../../../common/include/test
 
 # Test the API endpoints
 
-apitest = executable('api-test', ['api-test.cpp','util_filesystem.cpp','util_callbacks.cpp', common_test_files],
+apitest = executable('api-tests', ['api.tests.cpp','util_filesystem.cpp','util_callbacks.cpp', common_test_files],
     cpp_args: defns + flags,
     include_directories: inc,
     name_suffix: name_suffix,
@@ -142,9 +142,9 @@ apitest = executable('api-test', ['api-test.cpp','util_filesystem.cpp','util_cal
     dependencies: icuuc_dep
   )
 
-test('api-test', apitest, args: [output_path / 'blank_keyboard.kmx'])
+test('api-tests', apitest, args: [output_path / 'blank_keyboard.kmx'])
 
-usetapitest = executable('uset-api-test', 'uset-api-test.cpp', common_test_files,
+usetapitest = executable('uset-api-tests', 'uset-api.tests.cpp', common_test_files,
     cpp_args: defns + flags,
     include_directories: inc,
     name_suffix: name_suffix,
@@ -153,11 +153,11 @@ usetapitest = executable('uset-api-test', 'uset-api-test.cpp', common_test_files
     dependencies: icuuc_dep,
   )
 
-test('uset-api-test', usetapitest)
+test('uset-api-tests', usetapitest)
 
 # Google Test
 
-gtestcompilertest = executable('gtest-compiler-test', 'gtest-compiler-test.cpp',
+gtestcompilertest = executable('gtest-compiler-tests', 'gtest-compiler.tests.cpp',
     cpp_args: defns + flags,
     include_directories: inc,
     name_suffix: name_suffix,
@@ -166,9 +166,9 @@ gtestcompilertest = executable('gtest-compiler-test', 'gtest-compiler-test.cpp',
     dependencies: [ icuuc_dep, gtest_dep, gmock_dep ],
   )
 
-test('gtest-compiler-test', gtestcompilertest)
+test('gtest-compiler-tests', gtestcompilertest)
 
-gtest_km_u16_test = executable('gtest-km_u16-test', 'gtest-km_u16-test.cpp',
+gtest_km_u16_test = executable('gtest-km_u16-tests', 'gtest-km_u16.tests.cpp',
     cpp_args: defns + flags,
     include_directories: inc,
     name_suffix: name_suffix,
@@ -177,4 +177,4 @@ gtest_km_u16_test = executable('gtest-km_u16-test', 'gtest-km_u16-test.cpp',
     dependencies: [ icuuc_dep, gtest_dep, gmock_dep ],
   )
 
-test('gtest-km_u16-test', gtest_km_u16_test)
+test('gtest-km_u16-tests', gtest_km_u16_test)
diff --git a/developer/src/kmcmplib/tests/uset-api-test.cpp b/developer/src/kmcmplib/tests/uset-api.tests.cpp
similarity index 100%
rename from developer/src/kmcmplib/tests/uset-api-test.cpp
rename to developer/src/kmcmplib/tests/uset-api.tests.cpp
diff --git a/developer/src/server/test/tsconfig.json b/developer/src/server/test/tsconfig.json
index fa377b0fde1..b56cbcfa245 100644
--- a/developer/src/server/test/tsconfig.json
+++ b/developer/src/server/test/tsconfig.json
@@ -8,9 +8,9 @@
       "baseUrl": ".",
     },
   "include": [
-      "**/*.test.ts"
+      "**/*.tests.ts"
   ],
   "references": [
       { "path": "../" },
     ]
-}
\ No newline at end of file
+}
diff --git a/developer/src/server/test/version-data.test.ts b/developer/src/server/test/version-data.tests.ts
similarity index 100%
rename from developer/src/server/test/version-data.test.ts
rename to developer/src/server/test/version-data.tests.ts