diff --git a/HISTORY.md b/HISTORY.md
index b2771fd853..f0f0192e27 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,24 @@
 # Keyman Version History
 
+## 18.0.148 alpha 2024-11-29
+
+* test(common/web/types): unit tests for unicodeset-parser-api (#12714)
+* chore(developer): rename test files (#12707)
+* feat(core,linux,developer,windows): implement loading KMX from blob (#12721)
+* chore(common): add offline support for emscripten (#12740)
+
+## 18.0.147 alpha 2024-11-28
+
+* docs(android): Add android/docs/internal/README (#12717)
+* test(common/web/types): unit tests for string-list (#12702)
+* docs(common): linux and macOS emscripten setup (#12701)
+* refactor(developer): output number of tests when running on TC (#12710)
+* refactor(common): output number of tests when running on TC (#12719)
+* chore(web): rename file missed in #12704 (#12720)
+* fix(core): permanently disable logging (#12724)
+* fix(linux): disable assertions in release builds of ibus-keyman (#12725)
+* chore(common): improve offline builds (#12739)
+
 ## 18.0.146 alpha 2024-11-27
 
 * test(developer): kmcmplib compiler unit tests 5 (#12612)
diff --git a/VERSION.md b/VERSION.md
index 1c488bbaed..738e3946a8 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-18.0.147
\ No newline at end of file
+18.0.149
\ No newline at end of file
diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index b2ada0ecbc..75273aaa2c 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -80,13 +80,20 @@ function do_configure() {
 }
 
 function do_test() {
+  local MOCHA_FLAGS=
+
+  if [[ "${TEAMCITY_GIT_PATH:-}" != "" ]]; then
+    # we're running in TeamCity
+    MOCHA_FLAGS="-reporter mocha-teamcity-reporter"
+  fi
+
   eslint .
   tsc --build test
 
   readonly C8_THRESHOLD=60
 
   # Excludes are defined in .c8rc.json
-  c8 -skip-full --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha "${builder_extra_params[@]}"
+  c8 -skip-full --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
   builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
   builder_echo warning "Please increase threshold in build.sh as test coverage improves."
 }
diff --git a/common/web/types/test/ldml-keyboard/test-unicodeset-parser-api.ts b/common/web/types/test/ldml-keyboard/test-unicodeset-parser-api.ts
new file mode 100644
index 0000000000..cc36e78ae2
--- /dev/null
+++ b/common/web/types/test/ldml-keyboard/test-unicodeset-parser-api.ts
@@ -0,0 +1,24 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ * 
+ * Created by Dr Mark C. Sinclair on 2024-11-29
+ * 
+ * Test code for unicodeset-parser-api.ts
+ */
+
+import 'mocha';
+import { assert } from 'chai';
+import { UnicodeSet } from '../../src/ldml-keyboard/unicodeset-parser-api.js';
+
+describe('Test of Unicode-Parser-API', () => {
+  describe('Test UnicodeSet', () => {
+    it('can provide a correct ranges length', () => {
+      const unicodeSet = new UnicodeSet("[ħa-z]", [[0x41, 0x7A], [0x0127, 0x0127]]);
+      assert.equal(unicodeSet.length, 2);
+    });
+    it('can provide a correct string representation', () => {
+      const unicodeSet = new UnicodeSet("[ħa-z]", [[0x41, 0x7A], [0x0127, 0x0127]]);
+      assert.deepEqual(unicodeSet.toString(), "[ħa-z]");
+    });
+  });
+});
diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
index 328965e876..3c41182bab 100644
--- a/core/include/keyman/keyman_core_api.h
+++ b/core/include/keyman/keyman_core_api.h
@@ -1007,7 +1007,11 @@ Provides read-only information about a keyboard.
 typedef struct {
   km_core_cu const * version_string;
   km_core_cu const * id;
+
+  // TODO-web-core: Deprecate this field (#12497)
+  // KMN_DEPRECATED
   km_core_path_name  folder_path;
+
   km_core_option_item const * default_options;
 } km_core_keyboard_attrs;
 
@@ -1022,7 +1026,7 @@ typedef struct {
 : Keyman keyboard ID string.
 
 `folder_path`
-: Path to the unpacked folder containing the keyboard and associated resources.
+: Path to the unpacked folder containing the keyboard and associated resources (deprecated).
 
 `default_options`
 : Set of default values for any options included in the keyboard.
@@ -1096,12 +1100,16 @@ typedef struct {
 
 ## Description
 
+DEPRECATED: use [km_core_keyboard_load_from_blob] instead.
+
 Parse and load keyboard from the supplied path and a pointer to the loaded keyboard
-into the out paramter.
+into the out parameter.
 
 ## Specification
 
 ```c */
+// TODO-web-core: Deprecate this function (#12497)
+// KMN_DEPRECATED_API
 KMN_API
 km_core_status
 km_core_keyboard_load(km_core_path_name kb_path,
@@ -1140,6 +1148,60 @@ km_core_keyboard_load(km_core_path_name kb_path,
 
 -------------------------------------------------------------------------------
 
+# km_core_keyboard_load_from_blob()
+
+## Description
+
+Parse and load keyboard from the supplied blob and a pointer to the loaded keyboard
+into the out paramter.
+
+## Specification
+
+```c */
+KMN_API
+km_core_status km_core_keyboard_load_from_blob(const km_core_path_name kb_name,
+                                               const void* blob,
+                                               const size_t blob_size,
+                                               km_core_keyboard** keyboard);
+
+/*
+```
+
+## Parameters
+
+`kb_name`
+: a string with the name of the keyboard.
+
+`blob`
+: a byte array containing the content of a KMX/KMX+ file.
+
+`blob_size`
+: a size_t variable with the size of the blob in bytes.
+
+`keyboard`
+: A pointer to result variable: A pointer to the opaque keyboard
+  object returned by the Processor. This memory must be freed with a
+  call to [km_core_keyboard_dispose].
+
+## Returns
+
+`KM_CORE_STATUS_OK`
+: On success.
+
+`KM_CORE_STATUS_NO_MEM`
+: In the event an internal memory allocation fails.
+
+`KM_CORE_STATUS_IO_ERROR`
+: In the event the keyboard file is unparseable for any reason
+
+`KM_CORE_STATUS_INVALID_ARGUMENT`
+: In the event `keyboard` is null.
+
+`KM_CORE_STATUS_OS_ERROR`
+: Bit 31 (high bit) set, bits 0-30 are an OS-specific error code.
+
+-------------------------------------------------------------------------------
+
 # km_core_keyboard_dispose()
 
 ## Description
diff --git a/core/include/keyman/keyman_core_api_bits.h b/core/include/keyman/keyman_core_api_bits.h
index e00f4698a8..bd1f519bff 100644
--- a/core/include/keyman/keyman_core_api_bits.h
+++ b/core/include/keyman/keyman_core_api_bits.h
@@ -23,7 +23,6 @@
   #define _kmn_unused(x)        UNUSED_ ## x __attribute__((__unused__))
 #else
   #define _kmn_unused(x)        UNUSED_ ## x
-
 #endif
 
 #if defined _WIN32 || defined __CYGWIN__
@@ -36,7 +35,7 @@
     #undef _kmn_static_flag
   #else  // How MSVC sepcifies function level attributes adn deprecation
     #define _kmn_and
-    #define _kmn_tag_fn(a)       __declspec(a)
+    #define _kmn_tag_fn(a)     __declspec(a)
     #define _kmn_deprecated_flag deprecated
   #endif
   #define _kmn_export_flag     dllexport
@@ -48,6 +47,8 @@
   #define _KM_CORE_EXT_SEPARATOR ('.')
 #endif
 
+#define KMN_DEPRECATED        _kmn_tag_fn(_kmn_deprecated_flag)
+
 #if defined KM_CORE_LIBRARY_STATIC
   #define KMN_API             _kmn_tag_fn(_kmn_static_flag)
   #define KMN_DEPRECATED_API  _kmn_tag_fn(_kmn_deprecated_flag _kmn_and _kmn_static_flag)
diff --git a/core/src/keyboard.cpp b/core/src/keyboard.cpp
index 2c3a0c11b2..0f104f9422 100644
--- a/core/src/keyboard.cpp
+++ b/core/src/keyboard.cpp
@@ -17,18 +17,16 @@ void keyboard_attributes::render()
   // Make attributes point to the stored values above.
   id              = _keyboard_id.c_str();
   version_string  = _version_string.c_str();
-  folder_path     = _folder_path.c_str();
   default_options = _default_opts.data();
 }
 
 
 keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
     std::u16string const & version,
-    path_type const & path,
     options_store const &opts)
 : _keyboard_id(kbid),
   _version_string(version),
-  _folder_path(path),
+  _folder_path(""),
   _default_opts(opts)
 {
   // Ensure that the default_options array will be properly terminated.
@@ -40,7 +38,7 @@ keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
 keyboard_attributes::keyboard_attributes(keyboard_attributes &&rhs)
 : _keyboard_id(std::move(rhs._keyboard_id)),
   _version_string(std::move(rhs._version_string)),
-  _folder_path(std::move(rhs._folder_path)),
+  _folder_path(""),
   _default_opts(std::move(rhs._default_opts))
 {
     rhs.id = rhs.version_string = nullptr;
@@ -58,7 +56,6 @@ json & km::core::operator << (json & j, km::core::keyboard_attributes const & kb
 {
   j << json::object
       << "id" << kb.id
-      << "folder" << kb._folder_path
       << "version" << kb.version_string
       << "rules" << json::array << json::close;
 
diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp
index 142bf40e86..2ca7118d87 100644
--- a/core/src/keyboard.hpp
+++ b/core/src/keyboard.hpp
@@ -26,6 +26,7 @@ namespace core
   {
     std::u16string      _keyboard_id;
     std::u16string      _version_string;
+    // unused and deprecated
     core::path           _folder_path;
     std::vector<option> _default_opts;
 
@@ -33,7 +34,6 @@ namespace core
 
   public:
     using options_store = decltype(_default_opts);
-    using path_type = decltype(_folder_path);
 
     keyboard_attributes()
     : km_core_keyboard_attrs {nullptr, nullptr, nullptr, nullptr} {}
@@ -42,7 +42,6 @@ namespace core
 
     keyboard_attributes(std::u16string const & id,
              std::u16string const & version,
-             path_type const & path,
              options_store const &opts);
 
     keyboard_attributes & operator = (keyboard_attributes const &) = delete;
@@ -52,8 +51,6 @@ namespace core
 
     options_store const &   default_opts_store() const noexcept { return _default_opts; }
     options_store &         default_opts_store() noexcept { return _default_opts; }
-
-    path_type const     &   path() const noexcept { return _folder_path; }
   };
 
   json & operator << (json &, km::core::keyboard_attributes const &);
diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
index 964f73ca07..abaf3bfaa0 100644
--- a/core/src/km_core_keyboard_api.cpp
+++ b/core/src/km_core_keyboard_api.cpp
@@ -14,47 +14,125 @@
 #include "keyman_core.h"
 
 #include "keyboard.hpp"
-#include "processor.hpp"
 #include "kmx/kmx_processor.hpp"
 #include "ldml/ldml_processor.hpp"
 #include "mock/mock_processor.hpp"
+#include "processor.hpp"
+#include "utfcodec.hpp"
 
 using namespace km::core;
 
 namespace
 {
-  abstract_processor * processor_factory(path const & kb_path) {
-    // Some legacy packages may include upper-case file extensions
-    // TODO-LDML: move file io out of core and into engine
-    if (kb_path.suffix() == ".kmx" || kb_path.suffix() == ".KMX") {
-      std::vector<uint8_t> buf;
-      if(ldml_processor::is_kmxplus_file(kb_path, buf)) {
-        abstract_processor * result = new ldml_processor(kb_path, buf);
-        return result;
-      }
-      return new kmx_processor(kb_path);
+  abstract_processor* processor_factory(path const & kb_name, const std::vector<uint8_t> & buf) {
+    if (ldml_processor::is_handled(buf)) {
+      return new ldml_processor(kb_name, buf);
     }
-    else if (kb_path.suffix() == ".mock") {
-      return new mock_processor(kb_path);
+    if (kmx_processor::is_handled(buf)) {
+      return new kmx_processor(kb_name, buf);
     }
-    else {
-      return new null_processor();
+    if (mock_processor::is_handled(buf)) {
+      return new mock_processor(kb_name);
     }
+    return new null_processor();
   }
 
+}  // namespace
 
-}
 km_core_status
-km_core_keyboard_load(km_core_path_name kb_path, km_core_keyboard **keyboard)
+keyboard_load_from_blob_internal(
+  const km_core_path_name kb_name,
+  const std::vector<uint8_t> & buf,
+  km_core_keyboard** keyboard
+) {
+  assert(keyboard);
+  if (!keyboard) {
+    return KM_CORE_STATUS_INVALID_ARGUMENT;
+  }
+
+  *keyboard = nullptr;
+  try {
+    abstract_processor* kp = processor_factory(kb_name, buf);
+    km_core_status status  = kp->validate();
+    if (status != KM_CORE_STATUS_OK) {
+      delete kp;
+      return status;
+    }
+    *keyboard = static_cast<km_core_keyboard*>(kp);
+  } catch (std::bad_alloc&) {
+    return KM_CORE_STATUS_NO_MEM;
+  }
+  return KM_CORE_STATUS_OK;
+}
+
+km_core_status
+km_core_keyboard_load_from_blob(
+  const km_core_path_name kb_name,
+  const void* blob,
+  const size_t blob_size,
+  km_core_keyboard** keyboard
+) {
+  assert(keyboard);
+  if (!keyboard || !blob) {
+    return KM_CORE_STATUS_INVALID_ARGUMENT;
+  }
+
+  std::vector<uint8_t> buf((uint8_t*)blob, (uint8_t*)blob + blob_size);
+  return keyboard_load_from_blob_internal(kb_name, buf, keyboard);
+}
+
+// TODO-web-core: Remove this code when we remove the deprecated km_core_keyboard_load method
+// BEGIN DEPRECATED
+#include <fstream>
+std::vector<uint8_t> load_kmx_file(path const& kb_path) {
+  std::vector<uint8_t> data;
+  std::ifstream file(static_cast<std::string>(kb_path), std::ios::binary | std::ios::ate);
+  if (!file.good()) {
+    return std::vector<uint8_t>();
+  }
+  const std::streamsize size = file.tellg();
+  if (size >= KMX_MAX_ALLOWED_FILE_SIZE) {
+    return std::vector<uint8_t>();
+  }
+
+  file.seekg(0, std::ios::beg);
+
+  data.resize((size_t)size);
+  if (!file.read((char*)data.data(), size)) {
+    return std::vector<uint8_t>();
+  }
+
+  file.close();
+  return data;
+}
+
+KMN_DEPRECATED_API
+km_core_status
+km_core_keyboard_load(km_core_path_name kb, km_core_keyboard **keyboard)
 {
   assert(keyboard);
-  if (!keyboard)
+  if (!keyboard || !kb) {
     return KM_CORE_STATUS_INVALID_ARGUMENT;
+  }
 
+  path const kb_path(kb);
   try
   {
-    abstract_processor *kp = processor_factory(kb_path);
-    km_core_status status = kp->validate();
+    abstract_processor* kp = nullptr;
+    km_core_status status = KM_CORE_STATUS_OK;
+    // Some legacy packages may include upper-case file extensions
+    if (kb_path.suffix() == ".kmx" || kb_path.suffix() == ".KMX") {
+      std::vector<uint8_t> buf = load_kmx_file(kb_path);
+      status = keyboard_load_from_blob_internal(kb_path.stem().c_str(), buf, (km_core_keyboard**)&kp);
+      if (status != KM_CORE_STATUS_OK) {
+        return status;
+      }
+    } else if (kb_path.suffix() == ".mock") {
+      kp = new mock_processor(kb_path);
+    } else {
+      kp = new null_processor();
+    }
+    status = kp->validate();
     if (status != KM_CORE_STATUS_OK) {
       delete kp;
       return status;
@@ -67,6 +145,7 @@ km_core_keyboard_load(km_core_path_name kb_path, km_core_keyboard **keyboard)
   }
   return KM_CORE_STATUS_OK;
 }
+// END DEPRECATED
 
 void
 km_core_keyboard_dispose(km_core_keyboard *keyboard)
diff --git a/core/src/kmx/kmx_file.cpp b/core/src/kmx/kmx_file.cpp
index 8258c93b8a..2eea018581 100644
--- a/core/src/kmx/kmx_file.cpp
+++ b/core/src/kmx/kmx_file.cpp
@@ -13,9 +13,9 @@ using namespace kmx;
 #include <share.h>
 #endif
 
-KMX_BOOL KMX_ProcessEvent::Load(km_core_path_name KeyboardName)
-{
-  if(!LoadKeyboard(KeyboardName, &m_keyboard.Keyboard)) return FALSE;   // I5136
+KMX_BOOL KMX_ProcessEvent::Load(PKMX_BYTE buf, size_t sz) {
+  if(!LoadKeyboardFromBlob(buf, sz, &m_keyboard.Keyboard))
+    return FALSE;   // I5136
 
   return TRUE;
 }
@@ -51,50 +51,22 @@ const int km::core::kmx::CODE__SIZE[] = {
 // Ensure that all CODE_### sizes are defined
 static_assert(sizeof(CODE__SIZE) / sizeof(CODE__SIZE[0]) == (CODE_LASTCODE + 1), "Size of array CODE__SIZE not correct");
 
-
-
-KMX_BOOL KMX_ProcessEvent::LoadKeyboard(km_core_path_name fileName, LPKEYBOARD *lpKeyboard)
-{
-  PKMX_BYTE buf;
-  FILE *fp;
+KMX_BOOL KMX_ProcessEvent::LoadKeyboardFromBlob(
+  PKMX_BYTE original_buf,
+  size_t sz,
+  LPKEYBOARD* lpKeyboard
+) {
   LPKEYBOARD kbp;
+  PKMX_BYTE buf;
   PKMX_BYTE filebase;
 
-  DebugLog("Loading file '%s'", fileName);
-  if(!fileName || !lpKeyboard)
-  {
-    DebugLog("Bad Filename");
+
+  if (!lpKeyboard || !original_buf) {
+    DebugLog("Invalid parameter");
     return FALSE;
   }
 
-#if defined(_WIN32) || defined(_WIN64)
-  fp = _wfsopen(fileName, L"rb", _SH_DENYWR);
-#else
-  fp = fopen(fileName, "rb");
-#endif
-  if(fp == NULL)
-  {
-    DebugLog("Could not open file");
-    return FALSE;
-  }
-
-  if (fseek(fp, 0, SEEK_END) != 0) {
-    fclose(fp);
-    DebugLog("Could not fseek file");
-    return FALSE;
-  }
-
-  auto sz = ftell(fp);
-  if (sz < 0) {
-    fclose(fp);
-    return FALSE;
-  }
-
-  if (fseek(fp, 0, SEEK_SET) != 0) {
-    fclose(fp);
-    DebugLog("Could not fseek(set) file");
-    return FALSE;
-  }
+  *lpKeyboard = NULL;
 
 #ifdef KMX_64BIT
   // allocate enough memory for expanded data structure + original data.
@@ -108,57 +80,55 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboard(km_core_path_name fileName, LPKEYBOARD *
   buf = new KMX_BYTE[sz];
 #endif
 
-  if(!buf)
-  {
-    fclose(fp);
+  if (!buf) {
     DebugLog("Not allocmem");
     return FALSE;
   }
 #ifdef KMX_64BIT
-  filebase = buf + sz*2;
+  filebase = buf + sz * 2;
 #else
   filebase = buf;
 #endif
+  memcpy(filebase, original_buf, sz);
 
-  if (fread(filebase, 1, sz, fp) < (size_t) sz) {
-    fclose(fp);
-    DebugLog("Could not read file");
+  if (*PKMX_DWORD(filebase) != KMX_DWORD(FILEID_COMPILED)) {
+    DebugLog("Invalid keyboard - signature is invalid");
+    delete[] buf;
     return FALSE;
   }
 
-  fclose(fp);
-
-  if(*PKMX_DWORD(filebase) != KMX_DWORD(FILEID_COMPILED))
-  {
-    delete [] buf;
-    DebugLog("Invalid file - signature is invalid");
+  if (!VerifyKeyboard(filebase, sz)) {
+    DebugLog("Verify keyboard failed");
+    delete[] buf;
     return FALSE;
   }
 
-  if(!VerifyKeyboard(filebase, sz)) return FALSE;
-
 #ifdef KMX_64BIT
   kbp = CopyKeyboard(buf, filebase);
 #else
   kbp = FixupKeyboard(buf, filebase);
 #endif
 
-  if(!kbp) return FALSE;
+  if (!kbp) {
+    DebugLog("Can't copy/fixup keyboard");
+    delete[] buf;
+    return FALSE;
+  }
 
-  if(kbp->dwIdentifier != FILEID_COMPILED) {
-    delete [] buf;
+  if (kbp->dwIdentifier != FILEID_COMPILED) {
     DebugLog("errNotFileID");
+    delete[] buf;
     return FALSE;
   }
 
   *lpKeyboard = kbp;
-
   return TRUE;
 }
 
 PKMX_WCHAR KMX_ProcessEvent::StringOffset(PKMX_BYTE base, KMX_DWORD offset)
 {
-  if(offset == 0) return NULL;
+  if(offset == 0)
+    return NULL;
   return (PKMX_WCHAR)(base + offset);
 }
 
diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp
index 6e1e8dc2b4..70d20102bc 100644
--- a/core/src/kmx/kmx_processevent.cpp
+++ b/core/src/kmx/kmx_processevent.cpp
@@ -12,7 +12,7 @@ using namespace kmx;
 /* Globals */
 
 KMX_BOOL km::core::kmx::g_debug_ToConsole = FALSE;
-KMX_BOOL km::core::kmx::g_debug_KeymanLog = TRUE;
+KMX_BOOL km::core::kmx::g_debug_KeymanLog = FALSE; // workaround for #12661
 KMX_BOOL km::core::kmx::g_silent = FALSE;
 
 /*
diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
index 50e84c996d..090488dccb 100644
--- a/core/src/kmx/kmx_processevent.h
+++ b/core/src/kmx/kmx_processevent.h
@@ -54,7 +54,7 @@ private:
   KMX_DWORD m_modifiers = 0;
 
   /* File loading */
-  KMX_BOOL LoadKeyboard(km_core_path_name fileName, LPKEYBOARD *lpKeyboard);
+  KMX_BOOL LoadKeyboardFromBlob(PKMX_BYTE buf, size_t sz, LPKEYBOARD* lpKeyboard);
   KMX_BOOL VerifyKeyboard(PKMX_BYTE filebase, size_t sz);
   KMX_BOOL VerifyChecksum(PKMX_BYTE buf,  size_t sz);
 #ifdef KMX_64BIT
@@ -96,7 +96,7 @@ public:
   KMX_ProcessEvent();
   ~KMX_ProcessEvent();
 
-  KMX_BOOL Load(km_core_path_name keyboardName);
+  KMX_BOOL Load(PKMX_BYTE buf, size_t sz);
   KMX_BOOL ProcessEvent(km_core_state *state, KMX_UINT vkey, KMX_DWORD modifiers, KMX_BOOL isKeyDown);  // returns FALSE on error or key not matched
 
   KMX_Actions *GetActions();
diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp
index 95a9a09456..7ce8fad6ba 100644
--- a/core/src/kmx/kmx_processor.cpp
+++ b/core/src/kmx/kmx_processor.cpp
@@ -38,9 +38,8 @@ km_core_status kmx_processor::validate() const {
   return _valid ? KM_CORE_STATUS_OK : KM_CORE_STATUS_INVALID_KEYBOARD;
 }
 
-kmx_processor::kmx_processor(core::path p) {
-  p.replace_extension(".kmx");
-  _valid = bool(_kmx.Load(p.c_str()));
+kmx_processor::kmx_processor(std::u16string const& kb_name, const std::vector<uint8_t>& data) {
+  _valid = bool(_kmx.Load((PKMX_BYTE)data.data(), data.size()));
 
   if (!_valid)
     return;
@@ -57,8 +56,7 @@ kmx_processor::kmx_processor(core::path p) {
   auto v = _kmx.GetKeyboard()->Keyboard->version;
   auto vs = std::to_string(v >> 16) + "." + std::to_string(v & 0xffff);
 
-  _attributes = keyboard_attributes(static_cast<std::u16string>(p.stem()),
-                  std::u16string(vs.begin(), vs.end()), p.parent(), defaults);
+  _attributes = keyboard_attributes(kb_name, std::u16string(vs.begin(), vs.end()), defaults);
 }
 
 char16_t const *
@@ -414,3 +412,24 @@ km_core_keyboard_imx * kmx_processor::get_imx_list() const  {
   return imx_list;
 }
 
+/**
+ * Returns true the data is a KMX file, i.e. starts with 'KXTS'.
+ *
+ * @param data  the keyboard blob
+ * @return true if the processor can handle the keyboard, otherwise false.
+ */
+bool kmx_processor::is_handled(const std::vector<uint8_t>& data) {
+  if (data.empty()) {
+    return false;
+  }
+
+  if (data.size() < sizeof(COMP_KEYBOARD)) {  // a KMX file is at least 64 bytes (KMX header)
+    return false;
+  }
+
+  if (data.size() >= KMX_MAX_ALLOWED_FILE_SIZE) {
+    return false;
+  }
+
+  return ((kmx::PCOMP_KEYBOARD)data.data())->dwIdentifier == KMX_DWORD(FILEID_COMPILED);  // 'KXTS'
+}
diff --git a/core/src/kmx/kmx_processor.hpp b/core/src/kmx/kmx_processor.hpp
index 08b2c1d242..6e3c4dd963 100644
--- a/core/src/kmx/kmx_processor.hpp
+++ b/core/src/kmx/kmx_processor.hpp
@@ -29,7 +29,7 @@ namespace core
       );
 
   public:
-    kmx_processor(path);
+    kmx_processor(std::u16string const& kb_name, const std::vector<uint8_t>& data);
 
     km_core_status
     process_event(
@@ -84,6 +84,8 @@ namespace core
     supports_normalization() const override {
       return false;
     }
+
+    static bool is_handled(const std::vector<uint8_t>& buf);
   };
 
 } // namespace core
diff --git a/core/src/ldml/ldml_processor.cpp b/core/src/ldml/ldml_processor.cpp
index 0dfe0f5ee4..548c0d76b0 100644
--- a/core/src/ldml/ldml_processor.cpp
+++ b/core/src/ldml/ldml_processor.cpp
@@ -5,7 +5,6 @@
   Authors:      Marc Durdin (MD)
 */
 
-#include <fstream>
 #include <algorithm>
 #include "ldml/ldml_processor.hpp"
 #include "ldml/ldml_transforms.hpp"
@@ -15,6 +14,7 @@
 #include "kmx/kmx_plus.h"
 #include "kmx/kmx_xstring.h"
 #include "kmx/kmx_processevent.h"
+#include "kmx/kmx_processor.hpp"
 #include "ldml/keyman_core_ldml.h"
 #include "kmx/kmx_file_validator.hpp"
 #include "debuglog.h"
@@ -36,19 +36,15 @@ namespace {
 namespace km {
 namespace core {
 
-
-ldml_processor::ldml_processor(path const & kb_path, const std::vector<uint8_t> &data)
-: abstract_processor(
-    keyboard_attributes(kb_path.stem(), KM_CORE_LMDL_PROCESSOR_VERSION, kb_path.parent(), {})
-  ), _valid(false), transforms(), bksp_transforms(), keys(), normalization_disabled(false)
-{
-
+ldml_processor::ldml_processor(std::u16string const& kb_name, const std::vector<uint8_t>& data)
+    : abstract_processor(keyboard_attributes(kb_name, KM_CORE_LMDL_PROCESSOR_VERSION, {})),
+      _valid(false), transforms(), bksp_transforms(), keys(), normalization_disabled(false) {
   if(data.size() <= sizeof(kmx::COMP_KEYBOARD_EX)) {
     DebugLog("data.size %zu too small", data.size());
     return;
   }
 
-//   // Locate the structs here, but still retain ptrs to the raw structs.
+  // Locate the structs here, but still retain ptrs to the raw structs.
   kmx::KMX_FileValidator* comp_keyboard = (kmx::KMX_FileValidator*)data.data();
 
   // Perform the standard validation
@@ -116,40 +112,24 @@ ldml_processor::ldml_processor(path const & kb_path, const std::vector<uint8_t>
   _valid = true;
 }
 
-bool ldml_processor::is_kmxplus_file(path const & kb_path, std::vector<uint8_t>& data) {
-// TODO-LDML: we should refactor all the core components to delegate file loading
-//            to the Engine, which requires an API change, but this makes delivery
-//            of keyboard files more flexible under more WASM.
-
-  std::ifstream file(static_cast<std::string>(kb_path), std::ios::binary | std::ios::ate);
-  if(!file.good()) {
+/**
+ * Returns true if the data is a KMX+ file.
+ *
+ * @param data  the keyboard blob
+ * @return true if the processor can handle the keyboard, otherwise false.
+ */
+bool ldml_processor::is_handled(const std::vector<uint8_t>& data) {
+  // Check if it's a blob from a KMX file
+  if (!kmx_processor::is_handled(data)) {
     return false;
   }
-  const std::streamsize size = file.tellg();
-  if(size >= KMX_MAX_ALLOWED_FILE_SIZE) {
-    return false;
-  }
-
-  file.seekg(0, std::ios::beg);
-
-  data.resize((size_t)size);
-  if(!file.read((char *) data.data(), size)) {
-    return false;
-  }
-
-  file.close();
 
   const kmx::PCOMP_KEYBOARD comp_keyboard = (kmx::PCOMP_KEYBOARD)data.data();
-
-  if(comp_keyboard->dwIdentifier != KMX_DWORD(FILEID_COMPILED)) {
+  if (comp_keyboard->dwFileVersion < VERSION_160 || (comp_keyboard->dwFlags & KF_KMXPLUS) == 0) {
     return false;
   }
 
-  if(comp_keyboard->dwFileVersion < VERSION_160 || (comp_keyboard->dwFlags & KF_KMXPLUS) == 0) {
-    return false;
-  }
-
-  // A KMXPlus file is in the buffer (although more validation is required and will
+  // The buffer contains KMXPlus data (although more validation is required and will
   // be done in the constructor)
   return true;
 }
diff --git a/core/src/ldml/ldml_processor.hpp b/core/src/ldml/ldml_processor.hpp
index fa5fada27e..82f59292c3 100644
--- a/core/src/ldml/ldml_processor.hpp
+++ b/core/src/ldml/ldml_processor.hpp
@@ -30,13 +30,12 @@ class ldml_event_state;
 class ldml_processor : public abstract_processor {
   public:
     ldml_processor(
-      path const & kb_path,
+      std::u16string const& kb_name,
       const std::vector<uint8_t> & data
     );
 
     static bool is_kmxplus_file(
-      path const & kb_path,
-      std::vector<uint8_t>& data
+      const std::vector<uint8_t> & data
     );
 
     km_core_status
@@ -86,9 +85,11 @@ class ldml_processor : public abstract_processor {
       return !normalization_disabled;
     }
 
+    static bool is_handled(const std::vector<uint8_t> & buf);
+
   private:
     /** process a key-up */
-    void process_key_up(ldml_event_state &ldml_state) const;
+    void process_key_up(ldml_event_state& ldml_state) const;
 
     /** process a key-down (if it wasn't handled exceptionally) */
     void process_key_down(ldml_event_state &ldml_state) const;
diff --git a/core/src/meson.build b/core/src/meson.build
index 41c198543c..449dd3644f 100644
--- a/core/src/meson.build
+++ b/core/src/meson.build
@@ -48,23 +48,27 @@ endif
 generated_headers = []
 
 if cpp_compiler.get_id() == 'emscripten'
+  links += [
+    '-sEXPORTED_RUNTIME_METHODS=[\'UTF8ToString\',\'stringToNewUTF8\',\'wasmExports\']',
+    # Forcing inclusion of debug symbols
+    '-g', '-Wlimited-postlink-optimizations',
+    '-lembind'
+  ]
 
-util_normalize_table_generator = executable('util_normalize_table_generator',
-    ['util_normalize_table_generator.cpp'],
-    cpp_args: defns + warns,
-    include_directories: [inc],
-    link_args: links,
-    dependencies: [icu_uc, icu_i18n],
-    )
-
-util_normalize_table_h = custom_target('util_normalize_table.h',
-                    output: 'util_normalize_table.h',
-                    command: [util_normalize_table_generator],
-                    capture:true)
-
-generated_headers += util_normalize_table_h
+  util_normalize_table_generator = executable('util_normalize_table_generator',
+      ['util_normalize_table_generator.cpp'],
+      cpp_args: defns + warns,
+      include_directories: [inc],
+      link_args: links,
+      dependencies: [icu_uc, icu_i18n],
+      )
 
+  util_normalize_table_h = custom_target('util_normalize_table.h',
+                      output: 'util_normalize_table.h',
+                      command: [util_normalize_table_generator],
+                      capture:true)
 
+  generated_headers += util_normalize_table_h
 endif
 
 
diff --git a/core/src/mock/mock_processor.cpp b/core/src/mock/mock_processor.cpp
index d78ab5ef0e..570553264d 100644
--- a/core/src/mock/mock_processor.cpp
+++ b/core/src/mock/mock_processor.cpp
@@ -3,7 +3,7 @@
   Description:  This is a test implementation of the keyboard processor API to
                 enable testing API clients against a basic keyboard and give
                 them something to link against and load.
-                TODO: Add a mecahnism to trigger output of PERSIST_OPT &
+                TODO: Add a mechanism to trigger output of PERSIST_OPT &
                 RESET_OPT actions items, options support and context matching.
   Create Date:  17 Oct 2018
   Authors:      Tim Eves (TSE)
@@ -74,7 +74,7 @@ namespace km {
   {
     mock_processor::mock_processor(core::path const & path)
     : abstract_processor(
-        keyboard_attributes(path.stem(), u"3.145", path.parent(), {
+        keyboard_attributes(path.stem(), u"3.145", {
           option{KM_CORE_OPT_KEYBOARD, u"__test_point", u"not tiggered"},
         })),
       _options({
@@ -228,5 +228,23 @@ namespace km {
     km_core_status mock_processor::validate() const { return KM_CORE_STATUS_OK; }
 
     km_core_status null_processor::validate() const { return KM_CORE_STATUS_INVALID_ARGUMENT; }
-  } // namespace core
+
+    /**
+     * Returns true if the data starts with 'MOCK'.
+     *
+     * @param data  the keyboard blob
+     * @return true if the processor can handle the keyboard, otherwise false.
+     */
+    bool mock_processor::is_handled(const std::vector<uint8_t>& data) {
+      if (data.empty()) {
+        return false;
+      }
+
+      if (data.size() < 4) {  // a MOCK file is at least 4 bytes (MOCK)
+        return false;
+      }
+
+      return ((char*)data.data())[0] == 'M' && ((char*)data.data())[1] == 'O' && ((char*)data.data())[2] == 'C' && ((char*)data.data())[3] == 'K';
+    }
+  }  // namespace core
 } // namespace km
diff --git a/core/src/mock/mock_processor.hpp b/core/src/mock/mock_processor.hpp
index 97a7b82ab4..06fc29ad58 100644
--- a/core/src/mock/mock_processor.hpp
+++ b/core/src/mock/mock_processor.hpp
@@ -69,13 +69,21 @@ namespace core
     supports_normalization() const override {
       return true;
     }
+
+    /**
+     * Returns true if the data starts with 'MOCK'
+     *
+     * @param buf   the keyboard blob
+     * @return true if the processor can handle the keyboard, otherwise false.
+     */
+    static bool is_handled(const std::vector<uint8_t>& data);
   };
 
   class null_processor : public mock_processor {
   public:
     null_processor(): mock_processor(path())
     {
-      _attributes = keyboard_attributes(u"null", u"0.0", path(), {});
+      _attributes = keyboard_attributes(u"null", u"0.0", {});
     }
 
     km_core_status validate() const override;
diff --git a/core/src/util_normalize_table_generator.cpp b/core/src/util_normalize_table_generator.cpp
index 994f16d8b3..28edf68188 100644
--- a/core/src/util_normalize_table_generator.cpp
+++ b/core/src/util_normalize_table_generator.cpp
@@ -17,7 +17,6 @@
 
 #include "core_icu.h"
 
-#include <fstream>
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/core/subprojects/.gitignore b/core/subprojects/.gitignore
index 99479aa952..0161ac6349 100644
--- a/core/subprojects/.gitignore
+++ b/core/subprojects/.gitignore
@@ -2,3 +2,4 @@
 /*.zip
 /*.tgz
 /packagecache
+/googletest*/
diff --git a/core/subprojects/gtest.wrap b/core/subprojects/gtest.wrap
new file mode 100644
index 0000000000..a77eb315bf
--- /dev/null
+++ b/core/subprojects/gtest.wrap
@@ -0,0 +1,16 @@
+[wrap-file]
+directory = googletest-1.14.0
+source_url = https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz
+source_filename = gtest-1.14.0.tar.gz
+source_hash = 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7
+patch_filename = gtest_1.14.0-2_patch.zip
+patch_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-2/gtest_1.14.0-2_patch.zip
+patch_hash = 4ec7f767364386a99f7b2d61678287a73ad6ba0f9998be43b51794c464a63732
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-2/gtest-1.14.0.tar.gz
+wrapdb_version = 1.14.0-2
+
+[provide]
+gtest = gtest_dep
+gtest_main = gtest_main_dep
+gmock = gmock_dep
+gmock_main = gmock_main_dep
diff --git a/core/tests/unit/km_core_keyboard_api.tests.cpp b/core/tests/unit/km_core_keyboard_api.tests.cpp
new file mode 100644
index 0000000000..184ec130c4
--- /dev/null
+++ b/core/tests/unit/km_core_keyboard_api.tests.cpp
@@ -0,0 +1,128 @@
+// Copyright (c) 2024 SIL International
+// This software is licensed under the MIT license (http://opensource.org/licenses/MIT)
+
+#include <fstream>
+#include <gtest/gtest.h>
+
+#include <keyman/keyman_core_api.h>
+#include "emscripten_filesystem.h"
+#include "load_kmx_file.hpp"
+
+km::core::path test_dir;
+
+// TODO-web-core: Remove this code when we remove the deprecated km_core_keyboard_load method
+// BEGIN DEPRECATED
+#if defined(__GNUC__) || defined(__clang__)
+#define PRAGMA(X) _Pragma(#X)
+#define DISABLE_WARNING_PUSH PRAGMA(GCC diagnostic push)
+#define DISABLE_WARNING_POP PRAGMA(GCC diagnostic pop)
+#define DISABLE_WARNING(W) PRAGMA(GCC diagnostic ignored #W)
+#define DISABLE_WARNING_DEPRECATED_DECLARATIONS DISABLE_WARNING(-Wdeprecated-declarations)
+#else
+#define DISABLE_WARNING_PUSH
+#define DISABLE_WARNING_POP
+#define DISABLE_WARNING_DEPRECATED_DECLARATIONS
+#endif
+
+class KmCoreKeyboardApiTests : public testing::Test {
+protected:
+  km_core_keyboard* keyboard = nullptr;
+  void TearDown() override {
+    if (this->keyboard) {
+      km_core_keyboard_dispose(this->keyboard);
+      this->keyboard = nullptr;
+    }
+    }
+};
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromFile) {
+  // Setup
+  km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
+
+  // Execute
+  DISABLE_WARNING_PUSH
+  DISABLE_WARNING_DEPRECATED_DECLARATIONS
+  auto status = km_core_keyboard_load(kmxfile.c_str(), &this->keyboard);
+  DISABLE_WARNING_POP
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_OK);
+  EXPECT_TRUE(this->keyboard != nullptr);
+}
+// END DEPRECATED
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlob) {
+  // Setup
+  km::core::path kmxfile = km::core::path(test_dir / "kmx/k_020___deadkeys_and_backspace.kmx");
+
+  std::vector<uint8_t> data = km::tests::load_kmx_file(kmxfile.native());
+  ASSERT_GT(data.size(), (size_t)0);
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_OK);
+  EXPECT_TRUE(this->keyboard != nullptr);
+}
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlobMock) {
+  // Setup
+  km::core::path kmxfile = "mock_keyboard.mock";
+  std::string blob_string = "MOCK";
+
+  std::vector<uint8_t> data = std::vector<uint8_t>(blob_string.begin(), blob_string.end());
+  ASSERT_GT(data.size(), (size_t)0);
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_OK);
+  EXPECT_TRUE(this->keyboard != nullptr);
+}
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlobNull) {
+  // Setup
+  km::core::path kmxfile  = "";
+
+  std::unique_ptr<uint8_t> data(new uint8_t[0]);
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.get(), 0, &this->keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_INVALID_ARGUMENT);
+  EXPECT_TRUE(this->keyboard == nullptr);
+}
+
+TEST_F(KmCoreKeyboardApiTests, LoadFromBlobInvalidKeyboard) {
+  // Setup
+  km::core::path kmxfile  = "invalid_keyboard.kmx";
+  std::string blob_string = "KXTS";
+
+  std::vector<uint8_t> data = std::vector<uint8_t>(blob_string.begin(), blob_string.end());
+  for (auto i = data.size(); i < 64; i++) {
+    data.push_back(0);
+  }
+  ASSERT_GT(data.size(), (size_t)0);
+
+  // Execute
+  auto status = km_core_keyboard_load_from_blob(kmxfile.stem().c_str(), data.data(), data.size(), &this->keyboard);
+
+  // Verify
+  EXPECT_EQ(status, KM_CORE_STATUS_INVALID_KEYBOARD);
+  EXPECT_TRUE(this->keyboard == nullptr);
+}
+
+// provide our own `main` so that we can get the path of the exe so that
+// we have a well-defined location to find our test keyboards
+int main(int argc, char **argv) {
+#ifdef __EMSCRIPTEN__
+  test_dir = get_wasm_file_path(km::core::path(argv[0]).parent());
+#else
+  test_dir = km::core::path(argv[0]).parent();
+#endif
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/core/tests/unit/kmnkbd/action_set_api.tests.cpp b/core/tests/unit/kmnkbd/action_set_api.tests.cpp
index 05cceac121..72a2d9be53 100644
--- a/core/tests/unit/kmnkbd/action_set_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/action_set_api.tests.cpp
@@ -14,6 +14,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 const km_core_action_item alert_action_item();
 const km_core_action_item bksp_action_item(uint8_t type, uintptr_t value);
@@ -57,7 +58,9 @@ void setup(const char *keyboard, const km_core_cu* context) {
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, keyboard);
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
   try_status(context_items_from_utf16(context, &citems));
   try_status(km_core_context_set(km_core_state_context(test_state), citems));
diff --git a/core/tests/unit/kmnkbd/actions_get_api.tests.cpp b/core/tests/unit/kmnkbd/actions_get_api.tests.cpp
index cf936c1a1b..f9b7c75dac 100644
--- a/core/tests/unit/kmnkbd/actions_get_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/actions_get_api.tests.cpp
@@ -15,6 +15,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 km_core_option_item test_env_opts[] =
 {
@@ -48,7 +49,8 @@ void setup(const km_core_cu *app_context, const km_core_cu *cached_context, int
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, "..", "ldml", "keyboards", "k_001_tiny.kmx");
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
 
   try_status(set_context_from_string(km_core_state_context(test_state), cached_context));
diff --git a/core/tests/unit/kmnkbd/actions_normalize.tests.cpp b/core/tests/unit/kmnkbd/actions_normalize.tests.cpp
index 16799892d5..f71ef1cd3f 100644
--- a/core/tests/unit/kmnkbd/actions_normalize.tests.cpp
+++ b/core/tests/unit/kmnkbd/actions_normalize.tests.cpp
@@ -15,6 +15,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 void compare_context(km_core_context *app_context, const km_core_cu* expected_final_app_context);
 
@@ -46,7 +47,8 @@ void setup(const km_core_cu *app_context, const km_core_cu *cached_context_strin
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, "..", "ldml", "keyboards", "k_001_tiny.kmx");
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
 
   if(cached_context_string) {
diff --git a/core/tests/unit/kmnkbd/debug_api.tests.cpp b/core/tests/unit/kmnkbd/debug_api.tests.cpp
index 6f758a3cf1..d40664436b 100644
--- a/core/tests/unit/kmnkbd/debug_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/debug_api.tests.cpp
@@ -22,6 +22,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 using namespace km::core::kmx;
 
@@ -54,8 +55,8 @@ void setup(const char *keyboard) {
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, keyboard);
-
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
   try_status(context_items_from_utf16(u"Hello 😁", &citems));
 
diff --git a/core/tests/unit/kmnkbd/keyboard_api.tests.cpp b/core/tests/unit/kmnkbd/keyboard_api.tests.cpp
index bf232d69af..07dfb3e4cf 100644
--- a/core/tests/unit/kmnkbd/keyboard_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/keyboard_api.tests.cpp
@@ -8,8 +8,7 @@
 
 #include "keyman_core.h"
 #include "path.hpp"
-
-//#include "keyboard.hpp"
+#include "mock/mock_processor.hpp"
 
 namespace
 {
@@ -26,14 +25,11 @@ int main(int, char *[])
   km_core_keyboard_key * kb_key_list = nullptr;
   km_core_keyboard_imx * kb_imx_list = nullptr;
 
-  try_status(km_core_keyboard_load(test_kb_path.c_str(), &test_kb));
+  test_kb = (km_core_keyboard *)new km::core::mock_processor(test_kb_path);
   try_status(km_core_keyboard_get_attrs(test_kb, &kb_attrs));
   try_status(km_core_keyboard_get_key_list(test_kb,&kb_key_list));
   try_status(km_core_keyboard_get_imx_list(test_kb,&kb_imx_list));
 
-  if (kb_attrs->folder_path != test_kb_path.parent())
-    return __LINE__;
-
   km_core_keyboard_dispose(test_kb);
   km_core_keyboard_key_list_dispose(kb_key_list);
   km_core_keyboard_imx_list_dispose(kb_imx_list);
diff --git a/core/tests/unit/kmnkbd/state_api.tests.cpp b/core/tests/unit/kmnkbd/state_api.tests.cpp
index 6ada762edb..70dcce3133 100644
--- a/core/tests/unit/kmnkbd/state_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/state_api.tests.cpp
@@ -14,6 +14,7 @@
 #include "path.hpp"
 #include "state.hpp"
 #include "action_items.hpp"
+#include "mock/mock_processor.hpp"
 
 #include <test_assert.h>
 
@@ -52,7 +53,6 @@ constexpr char const *doc1_expected = u8"\
     \"$schema\" : \"keyman/core/docs/introspection.schema\",\n\
     \"keyboard\" : {\n\
         \"id\" : \"dummy\",\n\
-        \"folder\" : \"\",\n\
         \"version\" : \"3.145\",\n\
         \"rules\" : []\n\
     },\n\
@@ -78,7 +78,6 @@ constexpr char const *doc2_expected = u8"\
     \"$schema\" : \"keyman/core/docs/introspection.schema\",\n\
     \"keyboard\" : {\n\
         \"id\" : \"dummy\",\n\
-        \"folder\" : \"\",\n\
         \"version\" : \"3.145\",\n\
         \"rules\" : []\n\
     },\n\
@@ -112,7 +111,7 @@ int main(int argc, char * argv[])
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr,
                * test_clone = nullptr;
-  try_status(km_core_keyboard_load(km::core::path("dummy.mock").c_str(), &test_kb));
+  test_kb = (km_core_keyboard *)new km::core::mock_processor(km::core::path("dummy.mock"));
 
   // Simple sanity tests.
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmnkbd/state_context_api.tests.cpp b/core/tests/unit/kmnkbd/state_context_api.tests.cpp
index e090164bcb..34de27cd94 100644
--- a/core/tests/unit/kmnkbd/state_context_api.tests.cpp
+++ b/core/tests/unit/kmnkbd/state_context_api.tests.cpp
@@ -5,8 +5,10 @@
 
 #include "context.hpp"
 #include "path.hpp"
+#include "mock/mock_processor.hpp"
 
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 #include <test_assert.h>
 
 //-------------------------------------------------------------------------------------
@@ -41,7 +43,14 @@ setup(const char *keyboard, const km_core_cu *context, bool setup_app_context =
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, keyboard);
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  const auto mock_extension = ".mock";
+  if (strlen(keyboard) > strlen(mock_extension) && strcmp(keyboard + strlen(keyboard) - strlen(mock_extension), mock_extension) == 0) {
+    km::core::abstract_processor* kp = new km::core::mock_processor(keyboard);
+    test_kb = static_cast<km_core_keyboard*>(kp);
+  } else {
+    try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
+  }
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
   try_status(context_items_from_utf16(context, &citems));
   try_status(km_core_context_set(km_core_state_context(test_state), citems));
diff --git a/core/tests/unit/kmx/kmx.cpp b/core/tests/unit/kmx/kmx.cpp
index ba7978f21b..9eac21494a 100644
--- a/core/tests/unit/kmx/kmx.cpp
+++ b/core/tests/unit/kmx/kmx.cpp
@@ -29,6 +29,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 #include "kmx_test_source.hpp"
 
@@ -191,7 +192,8 @@ run_test(const km::core::path &source, const km::core::path &compiled) {
   km_core_keyboard * test_kb = nullptr;
   km_core_state * test_state = nullptr;
 
-  try_status(km_core_keyboard_load(compiled.c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(compiled.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(compiled.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmx/kmx_external_event.tests.cpp b/core/tests/unit/kmx/kmx_external_event.tests.cpp
index 26983e7cd4..15f2d284df 100644
--- a/core/tests/unit/kmx/kmx_external_event.tests.cpp
+++ b/core/tests/unit/kmx/kmx_external_event.tests.cpp
@@ -14,6 +14,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 #include <map>
 #include <iostream>
@@ -43,7 +44,8 @@ void test_external_event(const km::core::path &source_file){
 
   km::core::path full_path = source_file;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmx/kmx_imx.tests.cpp b/core/tests/unit/kmx/kmx_imx.tests.cpp
index 0736eb2fbb..ab2bbb372b 100644
--- a/core/tests/unit/kmx/kmx_imx.tests.cpp
+++ b/core/tests/unit/kmx/kmx_imx.tests.cpp
@@ -14,6 +14,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 #include "utfcodec.hpp"
 
 #include <map>
@@ -164,7 +165,8 @@ void test_imx_list(const km::core::path &source_file){
 
   km::core::path full_path = source_file;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
@@ -211,7 +213,8 @@ void test_queue_actions (const km::core::path &source_keyboard) {
 
   km::core::path full_path = source_keyboard;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/kmx/kmx_key_list.tests.cpp b/core/tests/unit/kmx/kmx_key_list.tests.cpp
index 04a79ae2b9..7b811bd0b1 100644
--- a/core/tests/unit/kmx/kmx_key_list.tests.cpp
+++ b/core/tests/unit/kmx/kmx_key_list.tests.cpp
@@ -15,6 +15,7 @@
 #include <test_assert.h>
 #include <test_color.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 using namespace km::core::kmx;
 
@@ -56,7 +57,8 @@ void test_key_list(const km::core::path &source_file){
 
   km::core::path full_path = source_file;
 
-  try_status(km_core_keyboard_load(full_path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(full_path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(full_path.stem().c_str(), blob.data(), blob.size(), &test_kb));
 
   // Setup state, environment
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
diff --git a/core/tests/unit/ldml/context_normalization.tests.cpp b/core/tests/unit/ldml/context_normalization.tests.cpp
index 7e54e1ce7f..ea9d635ab2 100644
--- a/core/tests/unit/ldml/context_normalization.tests.cpp
+++ b/core/tests/unit/ldml/context_normalization.tests.cpp
@@ -13,6 +13,7 @@
 
 #include <test_assert.h>
 #include "../emscripten_filesystem.h"
+#include "../load_kmx_file.hpp"
 
 //-------------------------------------------------------------------------------------
 // Context normalization tests
@@ -42,7 +43,8 @@ void setup(const char *keyboard) {
   teardown();
 
   km::core::path path = km::core::path::join(arg_path, "keyboards", keyboard);
-  try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
+  auto blob = km::tests::load_kmx_file(path.native().c_str());
+  try_status(km_core_keyboard_load_from_blob(path.stem().c_str(), blob.data(), blob.size(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
 }
 
diff --git a/core/tests/unit/ldml/core_ldml_min.tests.cpp b/core/tests/unit/ldml/core_ldml_min.tests.cpp
index c1b1356a37..fadd62a2a4 100644
--- a/core/tests/unit/ldml/core_ldml_min.tests.cpp
+++ b/core/tests/unit/ldml/core_ldml_min.tests.cpp
@@ -14,6 +14,7 @@
 #include <test_assert.h>
 
 #include "keyman_core.h"
+#include "../load_kmx_file.hpp"
 
 int main(int argc, const char *argv[]) {
 
@@ -22,7 +23,8 @@ int main(int argc, const char *argv[]) {
 
     km_core_status status;
     km_core_path_name nowhere = {0}; // this is a narrow or wide char string
-    status = km_core_keyboard_load(nowhere, &test_kb);
+    auto blob = km::tests::load_kmx_file(nowhere);
+    status = km_core_keyboard_load_from_blob(nowhere, blob.data(), blob.size(), &test_kb);
 
     std::cerr << "null km_core_keyboard_load = " << status << std::endl;
     test_assert(status == KM_CORE_STATUS_INVALID_ARGUMENT);
diff --git a/core/tests/unit/ldml/ldml.cpp b/core/tests/unit/ldml/ldml.cpp
index 2c23dc17b9..78e0aaceba 100644
--- a/core/tests/unit/ldml/ldml.cpp
+++ b/core/tests/unit/ldml/ldml.cpp
@@ -35,6 +35,7 @@
 #include "ldml/ldml_markers.hpp"
 
 #include "processor.hpp"
+#include "../load_kmx_file.hpp"
 
 namespace {
 
@@ -273,7 +274,8 @@ run_test(const km::core::path &source, const km::core::path &compiled, km::tests
   km_core_state * test_state = nullptr;
 
   const km_core_status expect_load_status = test_source.get_expected_load_status();
-  test_assert_equal(km_core_keyboard_load(compiled.c_str(), &test_kb), expect_load_status);
+  auto blob = km::tests::load_kmx_file(compiled.native().c_str());
+  test_assert_equal(km_core_keyboard_load_from_blob(compiled.stem().c_str(), blob.data(), blob.size(), &test_kb), expect_load_status);
 
   if (expect_load_status != KM_CORE_STATUS_OK) {
     std::cout << "Keyboard was expected to be invalid, so exiting " << std::endl;
diff --git a/core/tests/unit/ldml/ldml_test_source.cpp b/core/tests/unit/ldml/ldml_test_source.cpp
index 85aedb9434..94e10e7ac4 100644
--- a/core/tests/unit/ldml/ldml_test_source.cpp
+++ b/core/tests/unit/ldml/ldml_test_source.cpp
@@ -40,6 +40,8 @@
 #include "unicode/uniset.h"
 #include "unicode/usetiter.h"
 
+#include "../load_kmx_file.hpp"
+
 #include <test_assert.h>
 #include <test_color.h>
 
@@ -57,8 +59,6 @@ namespace km {
 namespace tests {
 
 
-
-
 /** string munging */
 static void append_to_str(std::u16string &str, const char *buf) {
   const PKMX_WCHAR p = km::core::kmx::strtowstr((char *)buf); /** cast away const, unused*/
@@ -758,7 +758,8 @@ int LdmlJsonTestSourceFactory::load(const km::core::path &compiled, const km::co
   }
 
   // check and load the KMX (yes, once again)
-  if(!km::core::ldml_processor::is_kmxplus_file(compiled, rawdata)) {
+  rawdata = km::tests::load_kmx_file(compiled);
+  if (!km::core::ldml_processor::is_handled(rawdata)) {
     std::cerr << "Reading KMX for test purposes failed: " << compiled << std::endl;
     return __LINE__;
   }
diff --git a/core/tests/unit/ldml/meson.build b/core/tests/unit/ldml/meson.build
index 9152612282..4b44f0d338 100644
--- a/core/tests/unit/ldml/meson.build
+++ b/core/tests/unit/ldml/meson.build
@@ -83,8 +83,11 @@ ldml = executable('ldml',
     )
 
 core_ldml_min = executable('core_ldml_min_tests',
-    ['core_ldml_min.tests.cpp',
-    common_test_files],
+    [
+      'core_ldml_min.tests.cpp',
+      common_test_files,
+      meson.current_source_dir() / '../load_kmx_file.cpp',
+    ],
     cpp_args: defns + warns,
     include_directories: [inc, libsrc],
     link_args: links,
diff --git a/core/tests/unit/load_kmx_file.cpp b/core/tests/unit/load_kmx_file.cpp
new file mode 100644
index 0000000000..41ccea0cac
--- /dev/null
+++ b/core/tests/unit/load_kmx_file.cpp
@@ -0,0 +1,34 @@
+#include <fstream>
+#include <iostream>
+#include <list>
+#include <string>
+
+#include "kmx_file.h"
+#include "path.hpp"
+#include "utfcodec.hpp"
+
+namespace km::tests {
+
+std::vector<uint8_t> load_kmx_file(km::core::path const& kb_path) {
+  std::vector<uint8_t> data;
+  std::ifstream file(static_cast<std::string>(kb_path), std::ios::binary | std::ios::ate);
+  if (file.fail()) {
+    return std::vector<uint8_t>();
+  }
+  const std::streamsize size = file.tellg();
+  if (size >= KMX_MAX_ALLOWED_FILE_SIZE) {
+    return std::vector<uint8_t>();
+  }
+
+  file.seekg(0, std::ios::beg);
+
+  data.resize((size_t)size);
+  if (!file.read((char*)data.data(), size)) {
+    return std::vector<uint8_t>();
+  }
+
+  file.close();
+  return data;
+}
+
+}
diff --git a/core/tests/unit/load_kmx_file.hpp b/core/tests/unit/load_kmx_file.hpp
new file mode 100644
index 0000000000..1a94b249c2
--- /dev/null
+++ b/core/tests/unit/load_kmx_file.hpp
@@ -0,0 +1,14 @@
+#ifndef __LOAD_KMX_FILE_HPP__
+#define __LOAD_KMX_FILE_HPP__
+
+#include "path.hpp"
+
+namespace km {
+namespace tests {
+
+std::vector<uint8_t> load_kmx_file(km::core::path const& kb_path);
+
+}
+}
+
+#endif  // __LOAD_KMX_FILE_HPP__
diff --git a/core/tests/unit/meson.build b/core/tests/unit/meson.build
index ee141cc12d..ea8b74ea97 100644
--- a/core/tests/unit/meson.build
+++ b/core/tests/unit/meson.build
@@ -1,13 +1,41 @@
 node = find_program('node', required: true)
 
-common_test_files = [
+gtest = subproject('gtest')
+gtest_dep = gtest.get_variable('gtest_dep')
+gmock_dep = gtest.get_variable('gmock_dep')
+
+test_util_files = [
   meson.current_source_dir() / 'emscripten_filesystem.cpp',
+  meson.current_source_dir() / 'load_kmx_file.cpp',
+]
+
+common_test_files = [
+  test_util_files,
   meson.global_source_root() / '../common/include/test_color.cpp'
 ]
 
 hextobin_root = meson.global_source_root() / '../common/tools/hextobin/build/hextobin.js'
 hextobin_cmd = [node, hextobin_root]
 
+if cpp_compiler.get_id() == 'emscripten'
+  extra_link_args = [ '-lnodefs.js' ]
+else
+  extra_link_args = []
+endif
+
+kmcorekeyboardapitests = executable('km_core_keyboard_api.tests',
+  [
+    'km_core_keyboard_api.tests.cpp',
+    test_util_files,
+  ],
+  include_directories: [inc, libsrc],
+  link_args: [ links, extra_link_args ],
+  dependencies: [icu_uc, icu_i18n, gtest_dep, gmock_dep],
+  objects: lib.extract_all_objects(recursive: false),
+)
+
+test('km-core-keyboard-api-tests', kmcorekeyboardapitests)
+
 subdir('json')
 subdir('utftest')
 subdir('kmnkbd')
diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh
index ddc6654993..f7433cb2fa 100755
--- a/developer/src/common/web/utils/build.sh
+++ b/developer/src/common/web/utils/build.sh
@@ -49,15 +49,5 @@ function do_build() {
 builder_run_action clean       rm -rf ./build/
 builder_run_action configure   verify_npm_setup
 builder_run_action build       do_build
-
-if builder_start_action test; then
-  eslint .
-  tsc --build test
-  readonly C8_THRESHOLD=50
-  c8 --reporter=lcov --reporter=text --exclude-after-remap --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha
-  builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
-  builder_echo warning "Please increase threshold in build.sh as test coverage improves."
-  builder_finish_action success test
-fi
-
-builder_run_action publish    builder_publish_npm
+builder_run_action test        builder_do_typescript_tests 50
+builder_run_action publish     builder_publish_npm
diff --git a/developer/src/common/web/utils/package.json b/developer/src/common/web/utils/package.json
index 7500db9259..4f066313f6 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 80851647bd..4c009e9d5c 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 fdf5fd474f..8ba9ac7668 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/build.sh b/developer/src/kmc-analyze/build.sh
index a4844c6afc..ace83ffbbe 100755
--- a/developer/src/kmc-analyze/build.sh
+++ b/developer/src/kmc-analyze/build.sh
@@ -25,18 +25,9 @@ builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
 
-function do_test() {
-  eslint .
-  cd test
-  tsc --build
-  cd ..
-  readonly C8_THRESHOLD=70
-  c8 --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha
-}
-
 builder_run_action clean      rm -rf ./build/
 builder_run_action configure  verify_npm_setup
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       do_test
+builder_run_action test       builder_do_typescript_tests 70
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-analyze/package.json b/developer/src/kmc-analyze/package.json
index 6299bf3a58..3d31dc04dd 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 01cc026dc1..9a45206853 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/build.sh b/developer/src/kmc-copy/build.sh
index 023f0c73bf..ee8615fc44 100755
--- a/developer/src/kmc-copy/build.sh
+++ b/developer/src/kmc-copy/build.sh
@@ -29,22 +29,16 @@ builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
 
-do_test() {
-  # note: `export TEST_SAVE_ARTIFACTS=1` to save a copy of artifacts to temp path
-  # note: `export TEST_SAVE_FIXTURES=1` to get a copy of cloud-based fixtures saved to online/
-  eslint .
-  cd test
-  tsc --build
-  cd ..
-  readonly C8_THRESHOLD=70
-  c8 -skip-full --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha "${builder_extra_params[@]}"
-  builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
-  builder_echo warning "Please increase threshold in build.sh as test coverage improves."
-}
+
 
 builder_run_action clean      rm -rf ./build/
 builder_run_action configure  verify_npm_setup
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       do_test
+
+# note: `export TEST_SAVE_ARTIFACTS=1` to save a copy of artifacts to temp path
+# note: `export TEST_SAVE_FIXTURES=1` to get a copy of cloud-based fixtures saved to online/
+# TODO: -skip-full
+builder_run_action test       builder_do_typescript_tests 70
+
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-copy/package.json b/developer/src/kmc-copy/package.json
index 9c90b345c7..35e587b5a3 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 145099305d..40f1dcb8cd 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/build.sh b/developer/src/kmc-generate/build.sh
index 6a86a9339f..e99e8288c2 100755
--- a/developer/src/kmc-generate/build.sh
+++ b/developer/src/kmc-generate/build.sh
@@ -36,17 +36,9 @@ do_build() {
   cp -R ./src/template/ ./build/src/
 }
 
-do_test() {
-  eslint .
-  cd test
-  tsc --build
-  cd ..
-  c8 --reporter=lcov --reporter=text mocha "${builder_extra_params[@]}"
-}
-
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
 builder_run_action configure  verify_npm_setup
 builder_run_action build      do_build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       do_test
+builder_run_action test       builder_do_typescript_tests
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-generate/package.json b/developer/src/kmc-generate/package.json
index 34eb2b4ebe..a8e0810338 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 6cbb24ae0f..122255b824 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/build.sh b/developer/src/kmc-keyboard-info/build.sh
index c85d76db01..acd6bd65de 100755
--- a/developer/src/kmc-keyboard-info/build.sh
+++ b/developer/src/kmc-keyboard-info/build.sh
@@ -32,23 +32,15 @@ function do_configure() {
   mkdir -p src/imports
   echo 'export default ' > src/imports/langtags.js
   cat "$KEYMAN_ROOT/resources/standards-data/langtags/langtags.json" >> src/imports/langtags.js
-
 }
+
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean       rm -rf ./build/ ./tsconfig.tsbuildinfo
 builder_run_action configure   do_configure
 builder_run_action build       tsc --build
 builder_run_action api         api-extractor run --local --verbose
-
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action test; then
-  eslint .
-  tsc --build test
-  c8 --reporter=lcov --reporter=text --exclude-after-remap mocha
-  builder_finish_action success test
-fi
+builder_run_action test        builder_do_typescript_tests
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-keyboard-info/package.json b/developer/src/kmc-keyboard-info/package.json
index 4d4a421025..45e1001501 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 e16b935aa4..2d85e0fcbd 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/build.sh b/developer/src/kmc-kmn/build.sh
index a073241475..c6ed29b6f9 100755
--- a/developer/src/kmc-kmn/build.sh
+++ b/developer/src/kmc-kmn/build.sh
@@ -56,27 +56,19 @@ function copy_deps() {
   cp ../kmcmplib/build/wasm/$BUILDER_CONFIGURATION/src/wasm-host.wasm ./build/src/import/kmcmplib/wasm-host.wasm
 }
 
-if builder_start_action build; then
+function do_build() {
   copy_deps
   tsc --build
-  builder_finish_action success build
-fi
+}
 
-builder_run_action api        api-extractor run --local --verbose
-
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action test; then
+function do_test() {
   copy_deps
-  tsc --build test/
-  npm run lint
-  readonly C8_THRESHOLD=80
-  c8 --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha
-  builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
-  builder_echo warning "Please increase threshold in build.sh as test coverage improves."
+  builder_do_typescript_tests 80
+}
 
-  builder_finish_action success test
-fi
+builder_run_action build      do_build
+builder_run_action api        api-extractor run --local --verbose
+builder_run_action test       do_test
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-kmn/package.json b/developer/src/kmc-kmn/package.json
index fc9470a6bc..1f5b8bbe9b 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 3737f8d2ac..dee653dfac 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/build.sh b/developer/src/kmc-ldml/build.sh
index 73a40c79d7..a961fea6fd 100755
--- a/developer/src/kmc-ldml/build.sh
+++ b/developer/src/kmc-ldml/build.sh
@@ -33,30 +33,19 @@ builder_describe_outputs \
 
 builder_parse "$@"
 
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action clean; then
+function do_clean() {
   rm -rf ./build/ ./tsconfig.tsbuildinfo
-  builder_finish_action success clean
-fi
+}
 
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action configure; then
+function do_configure() {
   verify_npm_setup
-  builder_finish_action success configure
-fi
+}
 
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action build; then
+function do_build() {
   npm run build
-  builder_finish_action success build
-fi
+}
 
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action build-fixtures; then
+function do_build_fixtures() {
   # Build basic.kmx and emit its checksum
   mkdir -p ./build/test/fixtures
   node ../kmc build ./test/fixtures/basic.xml --no-compiler-version --debug --out-file ./build/test/fixtures/basic-xml.kmx
@@ -65,22 +54,14 @@ if builder_start_action build-fixtures; then
 
   # Generate a binary file from basic.txt for comparison purposes
   node ../../../common/tools/hextobin/build/hextobin.js ./test/fixtures/basic.txt ./build/test/fixtures/basic-txt.kmx
+}
 
-  builder_finish_action success build-fixtures
-fi
-
-builder_run_action api        api-extractor run --local --verbose
-
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action test; then
-  eslint .
-  cd test
-  tsc -b
-  cd ..
-  c8 --reporter=lcov --reporter=text mocha "${builder_extra_params[@]}"
-  builder_finish_action success test
-fi
+builder_run_action clean           do_clean
+builder_run_action configure       do_configure
+builder_run_action build           do_build
+builder_run_action build-fixtures  do_build_fixtures
+builder_run_action api             api-extractor run --local --verbose
+builder_run_action test            builder_do_typescript_tests
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-ldml/package.json b/developer/src/kmc-ldml/package.json
index 11d7c07b88..cecbc8e15b 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 cda7185360..354f5235f1 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/build.sh b/developer/src/kmc-model-info/build.sh
index b1ba95c34b..153c356736 100755
--- a/developer/src/kmc-model-info/build.sh
+++ b/developer/src/kmc-model-info/build.sh
@@ -27,36 +27,11 @@ builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
 
-if builder_start_action clean; then
-  rm -rf ./build/ ./tsconfig.tsbuildinfo
-  builder_finish_action success clean
-fi
-
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action configure; then
-  verify_npm_setup
-  builder_finish_action success configure
-fi
-
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action build; then
-  npm run build
-  builder_finish_action success build
-fi
-
-builder_run_action api        api-extractor run --local --verbose
-
-#-------------------------------------------------------------------------------------------------------------------
-
-if builder_start_action test; then
-  eslint .
-  tsc --build test
-  c8 --reporter=lcov --reporter=text --exclude-after-remap --lines 80 mocha
-  # TODO: remove --lines 80 and improve coverage
-  builder_finish_action success test
-fi
+builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
+builder_run_action configure    verify_npm_setup
+builder_run_action build        tsc --build
+builder_run_action api          api-extractor run --local --verbose
+builder_run_action test         builder_do_typescript_tests 80
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-model-info/package.json b/developer/src/kmc-model-info/package.json
index 20be72d189..3a07f49ba1 100644
--- a/developer/src/kmc-model-info/package.json
+++ b/developer/src/kmc-model-info/package.json
@@ -30,7 +30,6 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "@keymanapp/common-types": "*",
     "@keymanapp/common-types": "*",
     "@keymanapp/developer-utils": "*"
   },
@@ -43,7 +42,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 e16b935aa4..2d85e0fcbd 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/build.sh b/developer/src/kmc-model/build.sh
index 372a145312..9e7166f8b7 100755
--- a/developer/src/kmc-model/build.sh
+++ b/developer/src/kmc-model/build.sh
@@ -32,13 +32,13 @@ builder_parse "$@"
 
 function do_build() {
   tsc -b ./tools/tsconfig.json
-  npm run build
+  tsc -b
 }
 
 builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
 builder_run_action configure    verify_npm_setup
 builder_run_action build        do_build
 builder_run_action api          api-extractor run --local --verbose
-builder_run_action test         npm test
+builder_run_action test         builder_do_typescript_tests
 builder_run_action publish      builder_publish_npm
 
diff --git a/developer/src/kmc-model/package.json b/developer/src/kmc-model/package.json
index 9f95de51f8..f17e7cec0e 100644
--- a/developer/src/kmc-model/package.json
+++ b/developer/src/kmc-model/package.json
@@ -18,7 +18,7 @@
   "scripts": {
     "build": "tsc -b",
     "lint": "eslint .",
-    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha"
+    "test": "./build.sh test"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "contributors": [
@@ -32,7 +32,6 @@
   "dependencies": {
     "@keymanapp/common-types": "*",
     "@keymanapp/keyman-version": "*",
-    "@keymanapp/common-types": "*",
     "typescript": "^5.4.5"
   },
   "devDependencies": {
@@ -46,7 +45,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 1b1ca1668f..e30096ba96 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/build.sh b/developer/src/kmc-package/build.sh
index 0b2d7bda9b..81f8b928c7 100755
--- a/developer/src/kmc-package/build.sh
+++ b/developer/src/kmc-package/build.sh
@@ -36,14 +36,5 @@ builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
 builder_run_action configure  verify_npm_setup
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
-
-if builder_start_action test; then
-  eslint .
-  cd test
-  tsc --build
-  cd ..
-  c8 --reporter=lcov --reporter=text mocha
-  builder_finish_action success test
-fi
-
+builder_run_action test       builder_do_typescript_tests
 builder_run_action publish     builder_publish_npm
diff --git a/developer/src/kmc-package/package.json b/developer/src/kmc-package/package.json
index 521ae02e44..93525e7330 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 62904114c8..fe3f8f22ea 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/build.sh b/developer/src/kmc/build.sh
index 6c3dfa17bd..684a9acbea 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -61,17 +61,6 @@ function do_api() {
 
 #-------------------------------------------------------------------------------------------------------------------
 
-function do_test() {
-  eslint .
-  tsc --build test/
-  readonly C8_THRESHOLD=50
-  c8 --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha
-  builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
-  builder_echo warning "Please increase threshold in build.sh as test coverage improves."
-}
-
-#-------------------------------------------------------------------------------------------------------------------
-
 function do_bundle() {
   SOURCEMAP_PATHS=( "${PACKAGES[@]}" )
   SOURCEMAP_PATHS=( "${SOURCEMAP_PATHS[@]/%//build}" )
@@ -110,7 +99,7 @@ function do_bundle() {
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
 builder_run_action configure  verify_npm_setup
 builder_run_action build      do_build
-builder_run_action test       do_test
+builder_run_action test       builder_do_typescript_tests 50
 builder_run_action api        do_api
 builder_run_action bundle     do_bundle
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json
index ccc4e950d8..1a1a3e0e95 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 3d0d6eb4f6..32419a8e57 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 1018dfb2e4..da2ac61a37 100644
--- a/developer/src/kmcmplib/tests/meson.build
+++ b/developer/src/kmcmplib/tests/meson.build
@@ -17,7 +17,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',common_test_files],
+kmcompxtest = executable('kmcompxtests', ['kmcompx.tests.cpp','util_filesystem.cpp','util_callbacks.cpp',common_test_files],
     cpp_args: defns + flags,
     include_directories: inc,
     name_suffix: name_suffix,
@@ -133,7 +133,7 @@ endif
 
 # 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 fa377b0fde..b56cbcfa24 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
diff --git a/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas b/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
index bcc522e28c..884eea627b 100644
--- a/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
+++ b/developer/src/tike/debug/Keyman.System.Debug.DebugCore.pas
@@ -37,6 +37,8 @@ type
 implementation
 
 uses
+  System.Classes,
+
   KeymanPaths;
 
 { TDebugCore }
@@ -44,6 +46,9 @@ uses
 constructor TDebugCore.Create(const Filename: string; EnableDebug: Boolean);
 var
   status: km_core_status;
+  fs: TFileStream;
+  Buffer: Pointer;
+  BufferSize: NativeInt;
 begin
   inherited Create;
 
@@ -52,7 +57,23 @@ begin
   FKeyboard := nil;
   FState := nil;
 
-  status := km_core_keyboard_load(PChar(FileName), FKeyboard);
+  Buffer := nil;
+  try
+    fs := TFileStream.Create(Filename, fmOpenRead or fmShareDenyWrite);
+    try
+      BufferSize := fs.Size;
+      Buffer := AllocMem(BufferSize);
+      if fs.Read(Buffer^, BufferSize) <> BufferSize then
+        raise EDebugCore.Create('Unable to start debugger -- failed to read file from disk');
+    finally
+      fs.Free;
+    end;
+
+    status := km_core_keyboard_load_from_blob(PChar(FileName), Buffer, BufferSize, FKeyboard);
+  finally
+    FreeMem(Buffer);
+  end;
+
   if status <> KM_CORE_STATUS_OK then
     raise EDebugCore.CreateFmt('Unable to start debugger -- keyboard load failed with error %x', [Ord(status)]);
 
diff --git a/developer/src/tike/main/Keyman.System.KeymanCore.pas b/developer/src/tike/main/Keyman.System.KeymanCore.pas
index 96f9219b37..22c4ac4943 100644
--- a/developer/src/tike/main/Keyman.System.KeymanCore.pas
+++ b/developer/src/tike/main/Keyman.System.KeymanCore.pas
@@ -245,8 +245,10 @@ type
 
   pkm_core_keyboard_attrs = ^km_core_keyboard_attrs;
 
-function km_core_keyboard_load(
-  kb_path: km_core_path_name;
+function km_core_keyboard_load_from_blob(
+  kb_name: km_core_path_name;
+  blob: Pointer;
+  blob_size: NativeUint;
   var keyboard: pkm_core_keyboard
 ): km_core_status; cdecl; external keymancore delayed;
 
diff --git a/linux/debian/libkeymancore2.symbols b/linux/debian/libkeymancore2.symbols
index 83aa5a5125..968f155551 100644
--- a/linux/debian/libkeymancore2.symbols
+++ b/linux/debian/libkeymancore2.symbols
@@ -2,7 +2,7 @@ libkeymancore.so.2 libkeymancore2 #MINVER#
 * Build-Depends-Package: libkeymancore-dev
 
  (c++|optional)"typeinfo name for std::codecvt_utf8_utf16<char16_t, 1114111ul, (std::codecvt_mode)0>@Base" 17.0.244
- (c++|optional)std::piecewise_construct@Base 18.0.118
+ (c++|optional)std::piecewise_construct@Base 18.0.145
  km_core_context_clear@Base 17.0.195
  km_core_context_get@Base 17.0.195
  km_core_context_item_list_size@Base 17.0.195
@@ -19,6 +19,7 @@ libkeymancore.so.2 libkeymancore2 #MINVER#
  km_core_keyboard_imx_list_dispose@Base 17.0.195
  km_core_keyboard_key_list_dispose@Base 17.0.195
  km_core_keyboard_load@Base 17.0.195
+ km_core_keyboard_load_from_blob@Base 18.0.101
  km_core_options_list_size@Base 17.0.195
  km_core_process_event@Base 17.0.195
  km_core_process_queued_actions@Base 17.0.195
diff --git a/linux/ibus-keyman/meson.build b/linux/ibus-keyman/meson.build
index 763a121245..98281849e8 100644
--- a/linux/ibus-keyman/meson.build
+++ b/linux/ibus-keyman/meson.build
@@ -8,6 +8,11 @@ project('ibus-keyman', 'c', 'cpp',
 # meson doesn't allow us to reference a file outside its root
 subdir('resources')
 
+if get_option('buildtype') != 'debug'
+  # Disable assertions on release builds
+  defns += ['-DG_DISABLE_ASSERT']
+endif
+
 conf = configuration_data()
 
 ibus =           dependency('ibus-1.0',             version: '>= 1.2.0')
diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c
index 4ec6cf002f..1dffba9cf3 100644
--- a/linux/ibus-keyman/src/engine.c
+++ b/linux/ibus-keyman/src/engine.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <errno.h>
 #include <ibus.h>
 #include <string.h>
 #include <stdio.h>
@@ -498,10 +499,10 @@ ibus_keyman_engine_constructor(
 
     g_strfreev(split_name);
 
-    g_autofree gchar *kmx_file = g_path_get_basename(abs_kmx_path);
-    p = rindex(kmx_file, '.'); // get id to use as dbus service name
+    g_autofree gchar *kmx_filename = g_path_get_basename(abs_kmx_path);
+    p = rindex(kmx_filename, '.'); // get id to use as dbus service name
     if (p) {
-        keyman->kb_name = g_strndup(kmx_file, p-kmx_file);
+        keyman->kb_name = g_strndup(kmx_filename, p-kmx_filename);
         p = rindex(abs_kmx_path, '.');
         if (p)
         {
@@ -516,7 +517,42 @@ ibus_keyman_engine_constructor(
 
     km_core_status status;
 
-    status = km_core_keyboard_load(abs_kmx_path, &(keyman->keyboard));
+    FILE* kmx_file = fopen(abs_kmx_path, "rb");
+    if (!kmx_file) {
+      g_warning("%s: problem opening kmx_file %s. (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
+      return NULL;
+    }
+
+    if (fseek(kmx_file, 0, SEEK_END) < 0) {
+      g_warning("%s: problem seeking to end of kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
+      fclose(kmx_file);
+      return NULL;
+    }
+    long length = ftell(kmx_file);
+    if (length < 0) {
+      g_warning("%s: problem determining length of kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
+      fclose(kmx_file);
+      return NULL;
+    }
+    rewind(kmx_file);
+    void* buffer = malloc(length);
+    if (!buffer) {
+      g_warning("%s: problem allocating buffer for reading kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
+      fclose(kmx_file);
+      return NULL;
+    }
+    if (fread(buffer, 1, length, kmx_file) != length) {
+      g_warning("%s: problem reading entire kmx_file %s (error: %s).", __FUNCTION__, abs_kmx_path, strerror(errno));
+      fclose(kmx_file);
+      free(buffer);
+      return NULL;
+    }
+    fclose(kmx_file);
+
+    status = km_core_keyboard_load_from_blob(abs_kmx_path, buffer, length,
+      &(keyman->keyboard));
+
+    free(buffer);
 
     if (status != KM_CORE_STATUS_OK) {
       g_warning("%s: problem loading km_core_keyboard %s. Status is %u.", __FUNCTION__, abs_kmx_path, status);
diff --git a/linux/ibus-keyman/src/meson.build b/linux/ibus-keyman/src/meson.build
index 2b436caef6..13b3caafc0 100644
--- a/linux/ibus-keyman/src/meson.build
+++ b/linux/ibus-keyman/src/meson.build
@@ -40,6 +40,8 @@ configure_file(
 
 exe = executable(
   'ibus-engine-keyman',
+  c_args: defns,
+  cpp_args: defns,
   sources: [engine_files, util_files],
   dependencies: deps,
   include_directories: include_dirs,
diff --git a/resources/build/_builder_nvm.sh b/resources/build/_builder_nvm.sh
index cccbb6b055..a1bb9a4cc1 100755
--- a/resources/build/_builder_nvm.sh
+++ b/resources/build/_builder_nvm.sh
@@ -41,8 +41,8 @@ type -t nvm >/dev/null || {
   }
 }
 
-nvm install "$REQUIRED_NODE_VERSION"
-nvm use "$REQUIRED_NODE_VERSION"
+nvm use "$REQUIRED_NODE_VERSION" || \
+  (nvm install "$REQUIRED_NODE_VERSION" && nvm use "$REQUIRED_NODE_VERSION")
 
 # Beware the hardcoded path below -- it should already be in the system PATH
 
diff --git a/resources/build/builder.md b/resources/build/builder.md
index dd52318810..b1accd5c8a 100644
--- a/resources/build/builder.md
+++ b/resources/build/builder.md
@@ -1055,6 +1055,26 @@ fi
 
 --------------------------------------------------------------------------------
 
+## `builder_do_typescript_tests` function
+
+Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
+
+**Note:** this is currently hosted in shellHelperFunctions.sh, but will
+be moved to builder.typescript.inc.sh in the future.
+
+### Usage
+
+```bash
+builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
+```
+
+### Parameters
+
+* **coverage_threshold** optional, minimum coverage for c8 to pass tests, 
+  defaults to 90 (percent)
+
+--------------------------------------------------------------------------------
+
 ## Formatting variables
 
 These helper variables define ANSI color escapes when running in color mode, and
diff --git a/resources/locate_emscripten.inc.sh b/resources/locate_emscripten.inc.sh
index 1d185f5552..57ed0cd559 100644
--- a/resources/locate_emscripten.inc.sh
+++ b/resources/locate_emscripten.inc.sh
@@ -66,10 +66,20 @@ _select_emscripten_version_with_emsdk() {
   fi
 
   export EMSDK_KEEP_DOWNLOADS=1
-  git pull
-  ./emsdk install "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
-  ./emsdk activate "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
-  cd upstream/emscripten
-  npm install
+  if builder_try_offline; then
+    if [[ ! -f ./emsdk_env.sh ]]; then
+      builder_die "emsdk_env.sh not found - emsdk not installed?"
+    fi
+    . ./emsdk_env.sh
+    if ! emcc --version | grep -q "$KEYMAN_MIN_VERSION_EMSCRIPTEN"; then
+      builder_die "Wrong emsdk version installed"
+    fi
+  else
+    git pull
+    ./emsdk install "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
+    ./emsdk activate "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
+    cd upstream/emscripten
+    npm install
+  fi
   popd > /dev/null
 }
diff --git a/resources/shellHelperFunctions.sh b/resources/shellHelperFunctions.sh
index 6f8e1b5268..eaa369b030 100755
--- a/resources/shellHelperFunctions.sh
+++ b/resources/shellHelperFunctions.sh
@@ -304,4 +304,42 @@ _select_node_version_with_nvm() {
 
 check-markdown() {
   node "$KEYMAN_ROOT/resources/tools/check-markdown" --root "$1"
+}
+
+# 
+# Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
+# 
+# Usage:
+#   builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
+# Parameters:
+#   1: coverage_threshold   optional, minimum coverage for c8 to pass tests, 
+#                           defaults to 90 (percent)
+#
+# Todo:
+#   Move to builder.typescript.inc.sh when this is established
+#
+builder_do_typescript_tests() {
+  local MOCHA_FLAGS=
+
+  if [[ "${TEAMCITY_GIT_PATH:-}" != "" ]]; then
+    # we're running in TeamCity
+    MOCHA_FLAGS="-reporter mocha-teamcity-reporter"
+  fi
+
+  eslint .
+  tsc --build test/
+
+  local THRESHOLD_PARAMS=
+  local C8_THRESHOLD=
+  if [[ $# -gt 0 ]]; then
+    C8_THRESHOLD=$1
+    THRESHOLD_PARAMS="--lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD"
+  fi
+
+  c8 --reporter=lcov --reporter=text --exclude-after-remap --check-coverage=false $THRESHOLD_PARAMS mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
+
+  if [[ ! -z "$C8_THRESHOLD" ]]; then
+    builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
+    builder_echo warning "Please increase threshold in build.sh as test coverage improves."
+  fi
 }
\ No newline at end of file
diff --git a/web/src/test/auto/dom/cases/attachment/pageContextAttachment.test.ts b/web/src/test/auto/dom/cases/attachment/pageContextAttachment.tests.ts
similarity index 100%
rename from web/src/test/auto/dom/cases/attachment/pageContextAttachment.test.ts
rename to web/src/test/auto/dom/cases/attachment/pageContextAttachment.tests.ts
diff --git a/windows/src/engine/keyman32/K32_load.cpp b/windows/src/engine/keyman32/K32_load.cpp
index c6bd1d4dfe..6ad3fc90b2 100644
--- a/windows/src/engine/keyman32/K32_load.cpp
+++ b/windows/src/engine/keyman32/K32_load.cpp
@@ -29,6 +29,7 @@
 */
 
 #include "pch.h"
+#include <stdio.h>
 
 BOOL GetKeyboardFileName(LPSTR kbname, LPSTR buf, int nbuf)
 {
@@ -78,17 +79,56 @@ BOOL LoadlpKeyboard(int i)
     _td->lpKeyboards[i].lpCoreKeyboardState = NULL;
   }
 
-  char buf[256];
-  if (!GetKeyboardFileName(_td->lpKeyboards[i].Name, buf, 255)) {
+  char kmx_filename[256];
+  if (!GetKeyboardFileName(_td->lpKeyboards[i].Name, kmx_filename, 255)) {
     return_SendDebugExit(FALSE);
   }
 
-  PWCHAR keyboardPath = strtowstr(buf);
-  km_core_status err_status = km_core_keyboard_load(keyboardPath, &_td->lpKeyboards[i].lpCoreKeyboard);
+  FILE* kmx_file = nullptr;
+  PWCHAR keyboardPath = nullptr;
+  void* buffer = nullptr;
+  errno_t status = fopen_s(&kmx_file, kmx_filename, "rb");
+
+  if (status) {
+    SendDebugMessageFormat("Problem opening kmx_file %s status [%d].", kmx_filename, status);
+    return_SendDebugExit(FALSE);
+  }
+
+  if (fseek(kmx_file, 0, SEEK_END) < 0 ) {
+    SendDebugMessageFormat("Problem seeking to end of kmx_file %s.", kmx_filename);
+    goto ExitError;
+  }
+
+  size_t length = ftell(kmx_file);
+
+  if (length < 0)
+  {
+    SendDebugMessageFormat("Problem determining length of kmx_file %s.", kmx_filename);
+    goto ExitError;
+  }
+
+  rewind(kmx_file);
+  buffer = malloc(length);
+
+  if (!buffer) {
+    SendDebugMessageFormat("Problem allocating buffer for reading kmx_file %s.", kmx_filename);
+    goto ExitError;
+  }
+
+  if (fread(buffer, 1, length, kmx_file) != length) {
+    SendDebugMessageFormat("Problem reading entire kmx_file %s.", kmx_filename);
+    goto ExitError;
+  }
+
+  fclose(kmx_file);
+  keyboardPath = strtowstr(kmx_filename);
+  km_core_status err_status = km_core_keyboard_load_from_blob(keyboardPath, buffer, length, &_td->lpKeyboards[i].lpCoreKeyboard);
+
+  free(buffer);
+
   if (err_status != KM_CORE_STATUS_OK) {
     SendDebugMessageFormat("km_core_keyboard_load failed for %ls with error status [%d]", keyboardPath, err_status);
-    delete[] keyboardPath;
-    return_SendDebugExit(FALSE);
+    goto ExitError;
   }
   delete[] keyboardPath;
 
@@ -105,22 +145,30 @@ BOOL LoadlpKeyboard(int i)
 
   if (err_status != KM_CORE_STATUS_OK) {
     SendDebugMessageFormat("km_core_state_create failed with error status [%d]", err_status);
-    // Dispose of the keyboard to leave us in a consistent state
-    ReleaseKeyboardMemoryCore(&_td->lpKeyboards[i].lpCoreKeyboard);
-    return_SendDebugExit(FALSE);
+    goto ExitError;
   }
   // Register callback?
   err_status = km_core_keyboard_get_imx_list(_td->lpKeyboards[i].lpCoreKeyboard, &_td->lpKeyboards[i].lpIMXList);
   if (err_status != KM_CORE_STATUS_OK) {
     SendDebugMessageFormat("km_core_keyboard_get_imx_list failed with error status [%d]", err_status);
-    // Dispose of the keyboard to leave us in a consistent state
-    ReleaseKeyboardMemoryCore(&_td->lpKeyboards[i].lpCoreKeyboard);
-    return_SendDebugExit(FALSE);
+    goto ExitError;
   }
 
   LoadDLLs(&_td->lpKeyboards[i]);
-
   LoadKeyboardOptionsRegistrytoCore(&_td->lpKeyboards[i], _td->lpKeyboards[i].lpCoreKeyboardState);
 
   return_SendDebugExit(TRUE);
+ExitError:
+  if (kmx_file) {
+    fclose(kmx_file);
+  }
+  if (buffer) {
+    free(buffer);
+  }
+  if (keyboardPath != nullptr) {
+    delete[] keyboardPath;
+  }
+  // Dispose of the keyboard to leave us in a consistent state
+  ReleaseKeyboardMemoryCore(&_td->lpKeyboards[i].lpCoreKeyboard);
+  return_SendDebugExit(FALSE);
 }