diff --git a/common/core/desktop/tests/unit/kmx/000 - null keyboard.kmx b/common/core/desktop/tests/unit/kmx/000 - null keyboard.kmx
deleted file mode 100644
index f0e9da6bcc..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/000 - null keyboard.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/001 - basic input UnicodeI.kmx b/common/core/desktop/tests/unit/kmx/001 - basic input UnicodeI.kmx
deleted file mode 100644
index fc59fa6a2d..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/001 - basic input UnicodeI.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/002 - basic input Unicode.kmx b/common/core/desktop/tests/unit/kmx/002 - basic input Unicode.kmx
deleted file mode 100644
index 0d2539a641..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/002 - basic input Unicode.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/003 - nul.kmx b/common/core/desktop/tests/unit/kmx/003 - nul.kmx
deleted file mode 100644
index 79046c521a..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/003 - nul.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/004 - basic input (shift 2).kmx b/common/core/desktop/tests/unit/kmx/004 - basic input (shift 2).kmx
deleted file mode 100644
index a31840fa24..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/004 - basic input (shift 2).kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/005 - nul with initial context.kmx b/common/core/desktop/tests/unit/kmx/005 - nul with initial context.kmx
deleted file mode 100644
index 79046c521a..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/005 - nul with initial context.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/006 - vkey input (shift ctrl).kmx b/common/core/desktop/tests/unit/kmx/006 - vkey input (shift ctrl).kmx
deleted file mode 100644
index 5320c4405c..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/006 - vkey input (shift ctrl).kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/007 - vkey input (ctrl alt).kmx b/common/core/desktop/tests/unit/kmx/007 - vkey input (ctrl alt).kmx
deleted file mode 100644
index a76e77d6d4..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/007 - vkey input (ctrl alt).kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmx b/common/core/desktop/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmx
deleted file mode 100644
index c197fa727a..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/012 - ralt.kmx b/common/core/desktop/tests/unit/kmx/012 - ralt.kmx
deleted file mode 100644
index cbab878a8a..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/012 - ralt.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx
deleted file mode 100644
index 68d8f4a313..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/014 - groups and virtual keys.kmx b/common/core/desktop/tests/unit/kmx/014 - groups and virtual keys.kmx
deleted file mode 100644
index 5a24d0909e..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/014 - groups and virtual keys.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/015 - ralt 2.kmx b/common/core/desktop/tests/unit/kmx/015 - ralt 2.kmx
deleted file mode 100644
index f565b4fee4..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/015 - ralt 2.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/017 - space mnemonic kbd.kmx b/common/core/desktop/tests/unit/kmx/017 - space mnemonic kbd.kmx
deleted file mode 100644
index 797014bda1..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/017 - space mnemonic kbd.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/018 - nul testing.kmx b/common/core/desktop/tests/unit/kmx/018 - nul testing.kmx
deleted file mode 100644
index 13204ad251..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/018 - nul testing.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/019 - multiple deadkeys.kmx b/common/core/desktop/tests/unit/kmx/019 - multiple deadkeys.kmx
deleted file mode 100644
index 44113e2d35..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/019 - multiple deadkeys.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/020 - deadkeys and backspace.kmx b/common/core/desktop/tests/unit/kmx/020 - deadkeys and backspace.kmx
deleted file mode 100644
index 3c245041b0..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/020 - deadkeys and backspace.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/021 - options.kmx b/common/core/desktop/tests/unit/kmx/021 - options.kmx
deleted file mode 100644
index c5550c1018..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/021 - options.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/022 - options with preset.kmx b/common/core/desktop/tests/unit/kmx/022 - options with preset.kmx
deleted file mode 100644
index 57f3720de7..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/022 - options with preset.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/023 - options with save.kmx b/common/core/desktop/tests/unit/kmx/023 - options with save.kmx
deleted file mode 100644
index f6689ce47e..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/023 - options with save.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/024 - options with save and preset.kmx b/common/core/desktop/tests/unit/kmx/024 - options with save and preset.kmx
deleted file mode 100644
index 029a136f78..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/024 - options with save and preset.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/025 - options with reset.kmx b/common/core/desktop/tests/unit/kmx/025 - options with reset.kmx
deleted file mode 100644
index e1595c8466..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/025 - options with reset.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/026 - system stores.kmx b/common/core/desktop/tests/unit/kmx/026 - system stores.kmx
deleted file mode 100644
index da2e0b30c0..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/026 - system stores.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/027 - system stores 2.kmx b/common/core/desktop/tests/unit/kmx/027 - system stores 2.kmx
deleted file mode 100644
index 43d58aaa2b..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/027 - system stores 2.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/028 - smp.kmx b/common/core/desktop/tests/unit/kmx/028 - smp.kmx
deleted file mode 100644
index da89544b3e..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/028 - smp.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/029 - beep.kmx b/common/core/desktop/tests/unit/kmx/029 - beep.kmx
deleted file mode 100644
index 1e809bdb33..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/029 - beep.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/030 - multiple groups.kmx b/common/core/desktop/tests/unit/kmx/030 - multiple groups.kmx
deleted file mode 100644
index 9b75bfca40..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/030 - multiple groups.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx
deleted file mode 100644
index e317f13349..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/032 - caps control.kmx b/common/core/desktop/tests/unit/kmx/032 - caps control.kmx
deleted file mode 100644
index 67d7ac2102..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/032 - caps control.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/033 - caps always off.kmx b/common/core/desktop/tests/unit/kmx/033 - caps always off.kmx
deleted file mode 100644
index 08bd6521fe..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/033 - caps always off.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/034 - options double set reset.kmx b/common/core/desktop/tests/unit/kmx/034 - options double set reset.kmx
deleted file mode 100644
index 92ef0da0ad..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/034 - options double set reset.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/035 - options double set staged.kmx b/common/core/desktop/tests/unit/kmx/035 - options double set staged.kmx
deleted file mode 100644
index 61970709ea..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/035 - options double set staged.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/036 - options - double reset staged.kmx b/common/core/desktop/tests/unit/kmx/036 - options - double reset staged.kmx
deleted file mode 100644
index 2cc4b21993..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/036 - options - double reset staged.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/037 - options - double reset.kmx b/common/core/desktop/tests/unit/kmx/037 - options - double reset.kmx
deleted file mode 100644
index 2e8120f6e5..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/037 - options - double reset.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/038 - punctkeys.kmx b/common/core/desktop/tests/unit/kmx/038 - punctkeys.kmx
deleted file mode 100644
index 2b892d51b8..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/038 - punctkeys.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/039 - generic ctrlalt.kmx b/common/core/desktop/tests/unit/kmx/039 - generic ctrlalt.kmx
deleted file mode 100644
index 897c02624d..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/039 - generic ctrlalt.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/040 - long context.kmx b/common/core/desktop/tests/unit/kmx/040 - long context.kmx
deleted file mode 100644
index c6025add0a..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/040 - long context.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/041 - long context and deadkeys.kmx b/common/core/desktop/tests/unit/kmx/041 - long context and deadkeys.kmx
deleted file mode 100644
index 7fcae5c7b8..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/041 - long context and deadkeys.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/042 - long context and split deadkeys.kmx b/common/core/desktop/tests/unit/kmx/042 - long context and split deadkeys.kmx
deleted file mode 100644
index 2f1bc7c5e1..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/042 - long context and split deadkeys.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/043 - output and keystroke.kmx b/common/core/desktop/tests/unit/kmx/043 - output and keystroke.kmx
deleted file mode 100644
index 120b42e2bc..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/043 - output and keystroke.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/044 - if and context.kmx b/common/core/desktop/tests/unit/kmx/044 - if and context.kmx
deleted file mode 100644
index ae70c6ab81..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/044 - if and context.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/045 - deadkey and context.kmx b/common/core/desktop/tests/unit/kmx/045 - deadkey and context.kmx
deleted file mode 100644
index 2ae9ff2eb6..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/045 - deadkey and context.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/046 - deadkey and contextex.kmx b/common/core/desktop/tests/unit/kmx/046 - deadkey and contextex.kmx
deleted file mode 100644
index 8a1a97b556..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/046 - deadkey and contextex.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/047 - caps always off initially on.kmx b/common/core/desktop/tests/unit/kmx/047 - caps always off initially on.kmx
deleted file mode 100644
index a890017c4c..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/047 - caps always off initially on.kmx and /dev/null differ
diff --git a/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx
deleted file mode 100644
index 52c70f61e0..0000000000
Binary files a/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx and /dev/null differ