refactor(tests): Move to native_posix_64 target.

* Allows removing multilib from docker images
* Run properly in aarch64 host docker
  containers for testing on Rasberry Pi.
* Small sticky-keys fix to initialize w/ correct
  constant for max uin32_t value.

175 files changed, 30 insertions, 0 deletions

diff --git a/app/tests/backlight/basic/native_posix.conf b/app/tests/backlight/basic/native_posix_64.conf
index 565121d319..565121d319 100644
--- a/app/tests/backlight/basic/native_posix.conf
+++ b/app/tests/backlight/basic/native_posix_64.conf
diff --git a/app/tests/backlight/basic/native_posix.keymap b/app/tests/backlight/basic/native_posix_64.keymap
index 185dbf7c8a..185dbf7c8a 100644
--- a/app/tests/backlight/basic/native_posix.keymap
+++ b/app/tests/backlight/basic/native_posix_64.keymap
diff --git a/app/tests/backlight/config-brt/native_posix.conf b/app/tests/backlight/config-brt/native_posix_64.conf
index 0d0758c0f9..0d0758c0f9 100644
--- a/app/tests/backlight/config-brt/native_posix.conf
+++ b/app/tests/backlight/config-brt/native_posix_64.conf
diff --git a/app/tests/backlight/config-brt/native_posix.keymap b/app/tests/backlight/config-brt/native_posix_64.keymap
index 6617c9f69c..6617c9f69c 100644
--- a/app/tests/backlight/config-brt/native_posix.keymap
+++ b/app/tests/backlight/config-brt/native_posix_64.keymap
diff --git a/app/tests/backlight/config-on/native_posix.conf b/app/tests/backlight/config-on/native_posix_64.conf
index 241c66a7c6..241c66a7c6 100644
--- a/app/tests/backlight/config-on/native_posix.conf
+++ b/app/tests/backlight/config-on/native_posix_64.conf
diff --git a/app/tests/backlight/config-on/native_posix.keymap b/app/tests/backlight/config-on/native_posix_64.keymap
index a95ccd93ef..a95ccd93ef 100644
--- a/app/tests/backlight/config-on/native_posix.keymap
+++ b/app/tests/backlight/config-on/native_posix_64.keymap
diff --git a/app/tests/backlight/config-step/native_posix.conf b/app/tests/backlight/config-step/native_posix_64.conf
index 4df7a86164..4df7a86164 100644
--- a/app/tests/backlight/config-step/native_posix.conf
+++ b/app/tests/backlight/config-step/native_posix_64.conf
diff --git a/app/tests/backlight/config-step/native_posix.keymap b/app/tests/backlight/config-step/native_posix_64.keymap
index 96fbe96a03..96fbe96a03 100644
--- a/app/tests/backlight/config-step/native_posix.keymap
+++ b/app/tests/backlight/config-step/native_posix_64.keymap
diff --git a/app/tests/backlight/cycle/native_posix.conf b/app/tests/backlight/cycle/native_posix_64.conf
index 565121d319..565121d319 100644
--- a/app/tests/backlight/cycle/native_posix.conf
+++ b/app/tests/backlight/cycle/native_posix_64.conf
diff --git a/app/tests/backlight/cycle/native_posix.keymap b/app/tests/backlight/cycle/native_posix_64.keymap
index a2f3c830c8..a2f3c830c8 100644
--- a/app/tests/backlight/cycle/native_posix.keymap
+++ b/app/tests/backlight/cycle/native_posix_64.keymap
diff --git a/app/tests/backlight/low-brightness/native_posix.conf b/app/tests/backlight/low-brightness/native_posix_64.conf
index 565121d319..565121d319 100644
--- a/app/tests/backlight/low-brightness/native_posix.conf
+++ b/app/tests/backlight/low-brightness/native_posix_64.conf
diff --git a/app/tests/backlight/low-brightness/native_posix.keymap b/app/tests/backlight/low-brightness/native_posix_64.keymap
index 3b01f7006a..3b01f7006a 100644
--- a/app/tests/backlight/low-brightness/native_posix.keymap
+++ b/app/tests/backlight/low-brightness/native_posix_64.keymap
diff --git a/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix.keymap b/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix_64.keymap
index 68c3249fa4..68c3249fa4 100644
--- a/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix.keymap
+++ b/app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix_64.keymap
diff --git a/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix.keymap b/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix_64.keymap
index 40a4d4a952..40a4d4a952 100644
--- a/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix.keymap
+++ b/app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix_64.keymap
diff --git a/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix.keymap b/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix_64.keymap
index 4219e3544e..4219e3544e 100644
--- a/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix.keymap
+++ b/app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix_64.keymap
diff --git a/app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap b/app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap
new file mode 100644
index 0000000000..e069556400
--- /dev/null
+++ b/app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap
@@ -0,0 +1,17 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan_mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <
+	ZMK_MOCK_PRESS(0,0,10000)
+	ZMK_MOCK_RELEASE(0,0,10)
+	ZMK_MOCK_PRESS(0,1,30)
+	ZMK_MOCK_RELEASE(0,1,30)
+	ZMK_MOCK_PRESS(0,0,10)
+	ZMK_MOCK_RELEASE(0,0,30)
+	ZMK_MOCK_PRESS(0,1,30)
+	ZMK_MOCK_RELEASE(0,1,1000)
+	>;
+};
\ No newline at end of file
diff --git a/app/tests/combo/combos-and-holdtaps-0/native_posix.keymap b/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap
index d35c727708..d35c727708 100644
--- a/app/tests/combo/combos-and-holdtaps-0/native_posix.keymap
+++ b/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap
diff --git a/app/tests/combo/combos-and-holdtaps-1/native_posix.keymap b/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap
index a99c15d97f..a99c15d97f 100644
--- a/app/tests/combo/combos-and-holdtaps-1/native_posix.keymap
+++ b/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap
diff --git a/app/tests/combo/combos-and-holdtaps-2/native_posix.keymap b/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap
index 7a78980874..7a78980874 100644
--- a/app/tests/combo/combos-and-holdtaps-2/native_posix.keymap
+++ b/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap
diff --git a/app/tests/combo/layer-filter-0/native_posix.keymap b/app/tests/combo/layer-filter-0/native_posix_64.keymap
index aac330f901..aac330f901 100644
--- a/app/tests/combo/layer-filter-0/native_posix.keymap
+++ b/app/tests/combo/layer-filter-0/native_posix_64.keymap
diff --git a/app/tests/combo/layer-filter-1/native_posix.keymap b/app/tests/combo/layer-filter-1/native_posix_64.keymap
index 995f27ee89..995f27ee89 100644
--- a/app/tests/combo/layer-filter-1/native_posix.keymap
+++ b/app/tests/combo/layer-filter-1/native_posix_64.keymap
diff --git a/app/tests/combo/multiple-timeouts/native_posix.keymap b/app/tests/combo/multiple-timeouts/native_posix_64.keymap
index 91bf52353d..91bf52353d 100644
--- a/app/tests/combo/multiple-timeouts/native_posix.keymap
+++ b/app/tests/combo/multiple-timeouts/native_posix_64.keymap
diff --git a/app/tests/combo/overlapping-combos-0/native_posix.keymap b/app/tests/combo/overlapping-combos-0/native_posix_64.keymap
index e3cbf43707..e3cbf43707 100644
--- a/app/tests/combo/overlapping-combos-0/native_posix.keymap
+++ b/app/tests/combo/overlapping-combos-0/native_posix_64.keymap
diff --git a/app/tests/combo/overlapping-combos-1/native_posix.keymap b/app/tests/combo/overlapping-combos-1/native_posix_64.keymap
index c228c475b9..c228c475b9 100644
--- a/app/tests/combo/overlapping-combos-1/native_posix.keymap
+++ b/app/tests/combo/overlapping-combos-1/native_posix_64.keymap
diff --git a/app/tests/combo/overlapping-combos-2/native_posix.keymap b/app/tests/combo/overlapping-combos-2/native_posix_64.keymap
index 3d36421383..3d36421383 100644
--- a/app/tests/combo/overlapping-combos-2/native_posix.keymap
+++ b/app/tests/combo/overlapping-combos-2/native_posix_64.keymap
diff --git a/app/tests/combo/overlapping-combos-3/native_posix.keymap b/app/tests/combo/overlapping-combos-3/native_posix_64.keymap
index 0622dcd047..0622dcd047 100644
--- a/app/tests/combo/overlapping-combos-3/native_posix.keymap
+++ b/app/tests/combo/overlapping-combos-3/native_posix_64.keymap
diff --git a/app/tests/combo/partially-overlapping-combos/native_posix.keymap b/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap
index 4e68105fb5..4e68105fb5 100644
--- a/app/tests/combo/partially-overlapping-combos/native_posix.keymap
+++ b/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap
diff --git a/app/tests/combo/press-release-long-combo-complete/native_posix.keymap b/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap
index 2a71ad32e8..2a71ad32e8 100644
--- a/app/tests/combo/press-release-long-combo-complete/native_posix.keymap
+++ b/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap
diff --git a/app/tests/combo/press-release-long-combo-incomplete/native_posix.keymap b/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap
index 68736d8fbc..68736d8fbc 100644
--- a/app/tests/combo/press-release-long-combo-incomplete/native_posix.keymap
+++ b/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap
diff --git a/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix.keymap b/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap
index b811718775..b811718775 100644
--- a/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix.keymap
+++ b/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap
diff --git a/app/tests/combo/press-release/native_posix.keymap b/app/tests/combo/press-release/native_posix_64.keymap
index 0f45792ddc..0f45792ddc 100644
--- a/app/tests/combo/press-release/native_posix.keymap
+++ b/app/tests/combo/press-release/native_posix_64.keymap
diff --git a/app/tests/combo/press-timeout/native_posix.keymap b/app/tests/combo/press-timeout/native_posix_64.keymap
index ff0b749330..ff0b749330 100644
--- a/app/tests/combo/press-timeout/native_posix.keymap
+++ b/app/tests/combo/press-timeout/native_posix_64.keymap
diff --git a/app/tests/combo/press1-press2-release1-release2/native_posix.keymap b/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap
index 2518bbc90e..2518bbc90e 100644
--- a/app/tests/combo/press1-press2-release1-release2/native_posix.keymap
+++ b/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap
diff --git a/app/tests/combo/press1-press2-release2-release1/native_posix.keymap b/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap
index 4895636e2b..4895636e2b 100644
--- a/app/tests/combo/press1-press2-release2-release1/native_posix.keymap
+++ b/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap
diff --git a/app/tests/combo/press1-release1-press2-release2/native_posix.keymap b/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap
index 0c4a698ce0..0c4a698ce0 100644
--- a/app/tests/combo/press1-release1-press2-release2/native_posix.keymap
+++ b/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap
diff --git a/app/tests/combo/slowrelease-disabled/native_posix.keymap b/app/tests/combo/slowrelease-disabled/native_posix_64.keymap
index 3bacb88698..3bacb88698 100644
--- a/app/tests/combo/slowrelease-disabled/native_posix.keymap
+++ b/app/tests/combo/slowrelease-disabled/native_posix_64.keymap
diff --git a/app/tests/combo/slowrelease-enabled/native_posix.keymap b/app/tests/combo/slowrelease-enabled/native_posix_64.keymap
index 8ac8316b18..8ac8316b18 100644
--- a/app/tests/combo/slowrelease-enabled/native_posix.keymap
+++ b/app/tests/combo/slowrelease-enabled/native_posix_64.keymap
diff --git a/app/tests/conditional-layer/chained-activation/native_posix.keymap b/app/tests/conditional-layer/chained-activation/native_posix_64.keymap
index d799cc5e5e..d799cc5e5e 100644
--- a/app/tests/conditional-layer/chained-activation/native_posix.keymap
+++ b/app/tests/conditional-layer/chained-activation/native_posix_64.keymap
diff --git a/app/tests/conditional-layer/mo-overlap/native_posix.keymap b/app/tests/conditional-layer/mo-overlap/native_posix_64.keymap
index 1518fc8a07..1518fc8a07 100644
--- a/app/tests/conditional-layer/mo-overlap/native_posix.keymap
+++ b/app/tests/conditional-layer/mo-overlap/native_posix_64.keymap
diff --git a/app/tests/conditional-layer/multiple-configs/native_posix.keymap b/app/tests/conditional-layer/multiple-configs/native_posix_64.keymap
index 8290649f9e..8290649f9e 100644
--- a/app/tests/conditional-layer/multiple-configs/native_posix.keymap
+++ b/app/tests/conditional-layer/multiple-configs/native_posix_64.keymap
diff --git a/app/tests/conditional-layer/quad-layer/native_posix.keymap b/app/tests/conditional-layer/quad-layer/native_posix_64.keymap
index 300b1f75f2..300b1f75f2 100644
--- a/app/tests/conditional-layer/quad-layer/native_posix.keymap
+++ b/app/tests/conditional-layer/quad-layer/native_posix_64.keymap
diff --git a/app/tests/conditional-layer/tri-layer-alt-order/native_posix.keymap b/app/tests/conditional-layer/tri-layer-alt-order/native_posix_64.keymap
index a31540380b..a31540380b 100644
--- a/app/tests/conditional-layer/tri-layer-alt-order/native_posix.keymap
+++ b/app/tests/conditional-layer/tri-layer-alt-order/native_posix_64.keymap
diff --git a/app/tests/conditional-layer/tri-layer/native_posix.keymap b/app/tests/conditional-layer/tri-layer/native_posix_64.keymap
index 150d6dd1ad..150d6dd1ad 100644
--- a/app/tests/conditional-layer/tri-layer/native_posix.keymap
+++ b/app/tests/conditional-layer/tri-layer/native_posix_64.keymap
diff --git a/app/tests/gresc/gresc-press-release/native_posix.keymap b/app/tests/gresc/gresc-press-release/native_posix_64.keymap
index 7ca3d77dfb..7ca3d77dfb 100644
--- a/app/tests/gresc/gresc-press-release/native_posix.keymap
+++ b/app/tests/gresc/gresc-press-release/native_posix_64.keymap
diff --git a/app/tests/gresc/gresc-two-instances/native_posix.keymap b/app/tests/gresc/gresc-two-instances/native_posix_64.keymap
index 0c38721de3..0c38721de3 100644
--- a/app/tests/gresc/gresc-two-instances/native_posix.keymap
+++ b/app/tests/gresc/gresc-two-instances/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap b/app/tests/hold-tap/balanced/1-dn-up/native_posix_64.keymap
index 040cdd3ee7..040cdd3ee7 100644
--- a/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/1-dn-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix_64.keymap
index 11d033f40d..11d033f40d 100644
--- a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix_64.keymap
index abb31b4b3a..abb31b4b3a 100644
--- a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 38575e9a20..38575e9a20 100644
--- a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 21baa447eb..21baa447eb 100644
--- a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index cd7ff384bf..cd7ff384bf 100644
--- a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index b84aa6265b..b84aa6265b 100644
--- a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index bdfaf9d3d9..bdfaf9d3d9 100644
--- a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index c0fd1bd184..c0fd1bd184 100644
--- a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 69c19676e7..69c19676e7 100644
--- a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac5f..301ef0ac5f 100644
--- a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/5-quick-tap/native_posix.keymap b/app/tests/hold-tap/balanced/5-quick-tap/native_posix_64.keymap
index 8f90ffadb4..8f90ffadb4 100644
--- a/app/tests/hold-tap/balanced/5-quick-tap/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/5-quick-tap/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/6-retro-tap/native_posix.keymap b/app/tests/hold-tap/balanced/6-retro-tap/native_posix_64.keymap
index 706ca54060..706ca54060 100644
--- a/app/tests/hold-tap/balanced/6-retro-tap/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/6-retro-tap/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix_64.keymap
index 11d033f40d..11d033f40d 100644
--- a/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap b/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
index d1d2b756c3..d1d2b756c3 100644
--- a/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap b/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
index 94d9a923cc..94d9a923cc 100644
--- a/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap b/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
index 6ddf87f895..6ddf87f895 100644
--- a/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/balanced/many-nested/native_posix.keymap b/app/tests/hold-tap/balanced/many-nested/native_posix_64.keymap
index 2698f0553e..2698f0553e 100644
--- a/app/tests/hold-tap/balanced/many-nested/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/many-nested/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix_64.keymap
index 040cdd3ee7..040cdd3ee7 100644
--- a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix_64.keymap
index 11d033f40d..11d033f40d 100644
--- a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
index abb31b4b3a..abb31b4b3a 100644
--- a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 38575e9a20..38575e9a20 100644
--- a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 21baa447eb..21baa447eb 100644
--- a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index cd7ff384bf..cd7ff384bf 100644
--- a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index b84aa6265b..b84aa6265b 100644
--- a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index bdfaf9d3d9..bdfaf9d3d9 100644
--- a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index c0fd1bd184..c0fd1bd184 100644
--- a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 69c19676e7..69c19676e7 100644
--- a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac5f..301ef0ac5f 100644
--- a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix.keymap b/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix_64.keymap
index 8f90ffadb4..8f90ffadb4 100644
--- a/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix.keymap b/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix_64.keymap
index 314b7334b8..314b7334b8 100644
--- a/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
index 11d033f40d..11d033f40d 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
index d1d2b756c3..d1d2b756c3 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
index 94d9a923cc..94d9a923cc 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
index 6ddf87f895..6ddf87f895 100644
--- a/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix_64.keymap
index 040cdd3ee7..040cdd3ee7 100644
--- a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix_64.keymap
index 11d033f40d..11d033f40d 100644
--- a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
index abb31b4b3a..abb31b4b3a 100644
--- a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 38575e9a20..38575e9a20 100644
--- a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 21baa447eb..21baa447eb 100644
--- a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index cd7ff384bf..cd7ff384bf 100644
--- a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index b84aa6265b..b84aa6265b 100644
--- a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index bdfaf9d3d9..bdfaf9d3d9 100644
--- a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index c0fd1bd184..c0fd1bd184 100644
--- a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 69c19676e7..69c19676e7 100644
--- a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac5f..301ef0ac5f 100644
--- a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix.keymap b/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix_64.keymap
index 8f90ffadb4..8f90ffadb4 100644
--- a/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix.keymap b/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix_64.keymap
index adbd648ecc..adbd648ecc 100644
--- a/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
index 11d033f40d..11d033f40d 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
index d1d2b756c3..d1d2b756c3 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
index 94d9a923cc..94d9a923cc 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
index 6ddf87f895..6ddf87f895 100644
--- a/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix_64.keymap
index 040cdd3ee7..040cdd3ee7 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix_64.keymap
index 11d033f40d..11d033f40d 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix_64.keymap
index abb31b4b3a..abb31b4b3a 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
index 38575e9a20..38575e9a20 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix_64.keymap
index 21baa447eb..21baa447eb 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
index cd7ff384bf..cd7ff384bf 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
index b84aa6265b..b84aa6265b 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
index bdfaf9d3d9..bdfaf9d3d9 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
index c0fd1bd184..c0fd1bd184 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix_64.keymap
index 69c19676e7..69c19676e7 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
index 301ef0ac5f..301ef0ac5f 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix_64.keymap
diff --git a/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix.keymap b/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix_64.keymap
index 8f90ffadb4..8f90ffadb4 100644
--- a/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix.keymap
+++ b/app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix_64.keymap
diff --git a/app/tests/key-repeat/ignore-other-usage-page-events/native_posix.keymap b/app/tests/key-repeat/ignore-other-usage-page-events/native_posix_64.keymap
index b042e8e097..b042e8e097 100644
--- a/app/tests/key-repeat/ignore-other-usage-page-events/native_posix.keymap
+++ b/app/tests/key-repeat/ignore-other-usage-page-events/native_posix_64.keymap
diff --git a/app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap b/app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap
new file mode 100644
index 0000000000..42f6514b3f
--- /dev/null
+++ b/app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap
@@ -0,0 +1,13 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan_mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <
+	ZMK_MOCK_PRESS(0,1,9000)
+	ZMK_MOCK_RELEASE(0,1,30)
+	ZMK_MOCK_PRESS(0,0,30)
+	ZMK_MOCK_RELEASE(0,0,3000)
+	>;
+};
\ No newline at end of file
diff --git a/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix.keymap b/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix_64.keymap
index ab9622e444..ab9622e444 100644
--- a/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix.keymap
+++ b/app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix_64.keymap
diff --git a/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix.keymap b/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix_64.keymap
index 9ff64468bb..9ff64468bb 100644
--- a/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix.keymap
+++ b/app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix_64.keymap
diff --git a/app/tests/keypress/kp-press-release/native_posix.keymap b/app/tests/keypress/kp-press-release/native_posix_64.keymap
index 0ddb7ab6ba..0ddb7ab6ba 100644
--- a/app/tests/keypress/kp-press-release/native_posix.keymap
+++ b/app/tests/keypress/kp-press-release/native_posix_64.keymap
diff --git a/app/tests/macros/basic/native_posix.keymap b/app/tests/macros/basic/native_posix_64.keymap
index 6a2391db66..6a2391db66 100644
--- a/app/tests/macros/basic/native_posix.keymap
+++ b/app/tests/macros/basic/native_posix_64.keymap
diff --git a/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix.keymap b/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix_64.keymap
index 2f3b943a70..2f3b943a70 100644
--- a/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix.keymap
+++ b/app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix_64.keymap
diff --git a/app/tests/macros/mo-plus-modifier-macro/native_posix.keymap b/app/tests/macros/mo-plus-modifier-macro/native_posix_64.keymap
index c264a9aba4..c264a9aba4 100644
--- a/app/tests/macros/mo-plus-modifier-macro/native_posix.keymap
+++ b/app/tests/macros/mo-plus-modifier-macro/native_posix_64.keymap
diff --git a/app/tests/macros/press-mid-macro/native_posix.keymap b/app/tests/macros/press-mid-macro/native_posix_64.keymap
index a075a44361..a075a44361 100644
--- a/app/tests/macros/press-mid-macro/native_posix.keymap
+++ b/app/tests/macros/press-mid-macro/native_posix_64.keymap
diff --git a/app/tests/macros/press-release/native_posix.keymap b/app/tests/macros/press-release/native_posix_64.keymap
index 6814d5421e..6814d5421e 100644
--- a/app/tests/macros/press-release/native_posix.keymap
+++ b/app/tests/macros/press-release/native_posix_64.keymap
diff --git a/app/tests/macros/timing-override/native_posix.keymap b/app/tests/macros/timing-override/native_posix_64.keymap
index 343926a7ca..343926a7ca 100644
--- a/app/tests/macros/timing-override/native_posix.keymap
+++ b/app/tests/macros/timing-override/native_posix_64.keymap
diff --git a/app/tests/macros/wait-macro-release/native_posix.keymap b/app/tests/macros/wait-macro-release/native_posix_64.keymap
index 6dabaeca1c..6dabaeca1c 100644
--- a/app/tests/macros/wait-macro-release/native_posix.keymap
+++ b/app/tests/macros/wait-macro-release/native_posix_64.keymap
diff --git a/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap
index b814242514..b814242514 100644
--- a/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix_64.keymap
index 26af565700..26af565700 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix_64.keymap
index 9df2c1527a..9df2c1527a 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix_64.keymap
index 5f9375fb85..5f9375fb85 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix_64.keymap
index 1b175d445e..1b175d445e 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix_64.keymap
index 0e9a2d6a8c..0e9a2d6a8c 100644
--- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap
+++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix_64.keymap
index 10d0dbf8ce..10d0dbf8ce 100644
--- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap
+++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix_64.keymap
index 3d6494dd8e..3d6494dd8e 100644
--- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap
+++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix_64.keymap
diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix_64.keymap
index d5f372f198..d5f372f198 100644
--- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix_64.keymap
diff --git a/app/tests/momentary-layer/1-normal/native_posix.keymap b/app/tests/momentary-layer/1-normal/native_posix_64.keymap
index b5249f7b75..b5249f7b75 100644
--- a/app/tests/momentary-layer/1-normal/native_posix.keymap
+++ b/app/tests/momentary-layer/1-normal/native_posix_64.keymap
diff --git a/app/tests/momentary-layer/2-early-key-release/native_posix.keymap b/app/tests/momentary-layer/2-early-key-release/native_posix_64.keymap
index 96e4e8d967..96e4e8d967 100644
--- a/app/tests/momentary-layer/2-early-key-release/native_posix.keymap
+++ b/app/tests/momentary-layer/2-early-key-release/native_posix_64.keymap
diff --git a/app/tests/momentary-layer/3-covered/native_posix.keymap b/app/tests/momentary-layer/3-covered/native_posix_64.keymap
index 2dde6d88c4..2dde6d88c4 100644
--- a/app/tests/momentary-layer/3-covered/native_posix.keymap
+++ b/app/tests/momentary-layer/3-covered/native_posix_64.keymap
diff --git a/app/tests/momentary-layer/4-nested/native_posix.keymap b/app/tests/momentary-layer/4-nested/native_posix_64.keymap
index fd376d0000..fd376d0000 100644
--- a/app/tests/momentary-layer/4-nested/native_posix.keymap
+++ b/app/tests/momentary-layer/4-nested/native_posix_64.keymap
diff --git a/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap b/app/tests/momentary-layer/5-nested-early-key-release/native_posix_64.keymap
index c467aea355..c467aea355 100644
--- a/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap
+++ b/app/tests/momentary-layer/5-nested-early-key-release/native_posix_64.keymap
diff --git a/app/tests/none/layered/native_posix.keymap b/app/tests/none/layered/native_posix_64.keymap
index 597ca2db78..597ca2db78 100644
--- a/app/tests/none/layered/native_posix.keymap
+++ b/app/tests/none/layered/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap b/app/tests/sticky-keys/1-os-dn-up/native_posix_64.keymap
index d0f26b2f73..d0f26b2f73 100644
--- a/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap
+++ b/app/tests/sticky-keys/1-os-dn-up/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/10-callum-mods/native_posix.keymap b/app/tests/sticky-keys/10-callum-mods/native_posix_64.keymap
index 9febf08c58..9febf08c58 100644
--- a/app/tests/sticky-keys/10-callum-mods/native_posix.keymap
+++ b/app/tests/sticky-keys/10-callum-mods/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/10-sl-sl-kp/native_posix.keymap b/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap
index e9b87f4215..e9b87f4215 100644
--- a/app/tests/sticky-keys/10-sl-sl-kp/native_posix.keymap
+++ b/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix.keymap b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix_64.keymap
index 33115453f0..33115453f0 100644
--- a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix.keymap
+++ b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix_64.keymap
index 2d078ba5f8..2d078ba5f8 100644
--- a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap
+++ b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix.keymap b/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap
index 4470fb2160..4470fb2160 100644
--- a/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix.keymap
+++ b/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix_64.keymap
index 438880d5ef..438880d5ef 100644
--- a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix_64.keymap
index 067f237936..067f237936 100644
--- a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap
+++ b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix_64.keymap
index d58641bd89..d58641bd89 100644
--- a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap
+++ b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix_64.keymap
index aac6725e57..aac6725e57 100644
--- a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix_64.keymap
index 66bb72d814..66bb72d814 100644
--- a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap
+++ b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix_64.keymap
index bdcccf3327..bdcccf3327 100644
--- a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap
+++ b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix_64.keymap
diff --git a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix_64.keymap
index d4c30fbf9c..d4c30fbf9c 100644
--- a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap
+++ b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix_64.keymap
diff --git a/app/tests/tap-dance/1a-tap1/native_posix.keymap b/app/tests/tap-dance/1a-tap1/native_posix_64.keymap
index 1e5dff0682..1e5dff0682 100644
--- a/app/tests/tap-dance/1a-tap1/native_posix.keymap
+++ b/app/tests/tap-dance/1a-tap1/native_posix_64.keymap
diff --git a/app/tests/tap-dance/1b-tap2/native_posix.keymap b/app/tests/tap-dance/1b-tap2/native_posix_64.keymap
index c5e1c8db6e..c5e1c8db6e 100644
--- a/app/tests/tap-dance/1b-tap2/native_posix.keymap
+++ b/app/tests/tap-dance/1b-tap2/native_posix_64.keymap
diff --git a/app/tests/tap-dance/1c-tap3/native_posix.keymap b/app/tests/tap-dance/1c-tap3/native_posix_64.keymap
index 6813393e5d..6813393e5d 100644
--- a/app/tests/tap-dance/1c-tap3/native_posix.keymap
+++ b/app/tests/tap-dance/1c-tap3/native_posix_64.keymap
diff --git a/app/tests/tap-dance/2a-hold1/native_posix.keymap b/app/tests/tap-dance/2a-hold1/native_posix_64.keymap
index f4c7a2d29a..f4c7a2d29a 100644
--- a/app/tests/tap-dance/2a-hold1/native_posix.keymap
+++ b/app/tests/tap-dance/2a-hold1/native_posix_64.keymap
diff --git a/app/tests/tap-dance/2b-hold2/native_posix.keymap b/app/tests/tap-dance/2b-hold2/native_posix_64.keymap
index 0fec2e40fe..0fec2e40fe 100644
--- a/app/tests/tap-dance/2b-hold2/native_posix.keymap
+++ b/app/tests/tap-dance/2b-hold2/native_posix_64.keymap
diff --git a/app/tests/tap-dance/2c-hold3/native_posix.keymap b/app/tests/tap-dance/2c-hold3/native_posix_64.keymap
index 8375c6f639..8375c6f639 100644
--- a/app/tests/tap-dance/2c-hold3/native_posix.keymap
+++ b/app/tests/tap-dance/2c-hold3/native_posix_64.keymap
diff --git a/app/tests/tap-dance/3a-tap-int-mid/native_posix.keymap b/app/tests/tap-dance/3a-tap-int-mid/native_posix_64.keymap
index 8a62430c5a..8a62430c5a 100644
--- a/app/tests/tap-dance/3a-tap-int-mid/native_posix.keymap
+++ b/app/tests/tap-dance/3a-tap-int-mid/native_posix_64.keymap
diff --git a/app/tests/tap-dance/3b-tap-int-seq/native_posix.keymap b/app/tests/tap-dance/3b-tap-int-seq/native_posix_64.keymap
index 4a76bdb094..4a76bdb094 100644
--- a/app/tests/tap-dance/3b-tap-int-seq/native_posix.keymap
+++ b/app/tests/tap-dance/3b-tap-int-seq/native_posix_64.keymap
diff --git a/app/tests/tap-dance/3c-tap-int-after/native_posix.keymap b/app/tests/tap-dance/3c-tap-int-after/native_posix_64.keymap
index e1b6d97989..e1b6d97989 100644
--- a/app/tests/tap-dance/3c-tap-int-after/native_posix.keymap
+++ b/app/tests/tap-dance/3c-tap-int-after/native_posix_64.keymap
diff --git a/app/tests/tap-dance/3d-hold-int-mid/native_posix.keymap b/app/tests/tap-dance/3d-hold-int-mid/native_posix_64.keymap
index 55a98d361a..55a98d361a 100644
--- a/app/tests/tap-dance/3d-hold-int-mid/native_posix.keymap
+++ b/app/tests/tap-dance/3d-hold-int-mid/native_posix_64.keymap
diff --git a/app/tests/tap-dance/3e-hold-int-seq/native_posix.keymap b/app/tests/tap-dance/3e-hold-int-seq/native_posix_64.keymap
index b31e92dce1..b31e92dce1 100644
--- a/app/tests/tap-dance/3e-hold-int-seq/native_posix.keymap
+++ b/app/tests/tap-dance/3e-hold-int-seq/native_posix_64.keymap
diff --git a/app/tests/tap-dance/3f-hold-int-after/native_posix.keymap b/app/tests/tap-dance/3f-hold-int-after/native_posix_64.keymap
index 6397fbb341..6397fbb341 100644
--- a/app/tests/tap-dance/3f-hold-int-after/native_posix.keymap
+++ b/app/tests/tap-dance/3f-hold-int-after/native_posix_64.keymap
diff --git a/app/tests/tap-dance/4a-single/native_posix.keymap b/app/tests/tap-dance/4a-single/native_posix_64.keymap
index 348a682724..348a682724 100644
--- a/app/tests/tap-dance/4a-single/native_posix.keymap
+++ b/app/tests/tap-dance/4a-single/native_posix_64.keymap
diff --git a/app/tests/tap-dance/5a-tdint-mid/native_posix.keymap b/app/tests/tap-dance/5a-tdint-mid/native_posix_64.keymap
index 2188fd020e..2188fd020e 100644
--- a/app/tests/tap-dance/5a-tdint-mid/native_posix.keymap
+++ b/app/tests/tap-dance/5a-tdint-mid/native_posix_64.keymap
diff --git a/app/tests/tap-dance/5b-tdint-seq/native_posix.keymap b/app/tests/tap-dance/5b-tdint-seq/native_posix_64.keymap
index 320b7199b7..320b7199b7 100644
--- a/app/tests/tap-dance/5b-tdint-seq/native_posix.keymap
+++ b/app/tests/tap-dance/5b-tdint-seq/native_posix_64.keymap
diff --git a/app/tests/tap-dance/5c-tdint-after/native_posix.keymap b/app/tests/tap-dance/5c-tdint-after/native_posix_64.keymap
index 17e538bd86..17e538bd86 100644
--- a/app/tests/tap-dance/5c-tdint-after/native_posix.keymap
+++ b/app/tests/tap-dance/5c-tdint-after/native_posix_64.keymap
diff --git a/app/tests/tap-dance/5d-tdint-multiple/native_posix.keymap b/app/tests/tap-dance/5d-tdint-multiple/native_posix_64.keymap
index 150f6d05f6..150f6d05f6 100644
--- a/app/tests/tap-dance/5d-tdint-multiple/native_posix.keymap
+++ b/app/tests/tap-dance/5d-tdint-multiple/native_posix_64.keymap
diff --git a/app/tests/to-layer/normal/native_posix.keymap b/app/tests/to-layer/normal/native_posix_64.keymap
index 056341f77d..056341f77d 100644
--- a/app/tests/to-layer/normal/native_posix.keymap
+++ b/app/tests/to-layer/normal/native_posix_64.keymap
diff --git a/app/tests/toggle-layer/early-key-release/native_posix.keymap b/app/tests/toggle-layer/early-key-release/native_posix_64.keymap
index 6c29339002..6c29339002 100644
--- a/app/tests/toggle-layer/early-key-release/native_posix.keymap
+++ b/app/tests/toggle-layer/early-key-release/native_posix_64.keymap
diff --git a/app/tests/toggle-layer/normal/native_posix.keymap b/app/tests/toggle-layer/normal/native_posix_64.keymap
index 9df9d649c0..9df9d649c0 100644
--- a/app/tests/toggle-layer/normal/native_posix.keymap
+++ b/app/tests/toggle-layer/normal/native_posix_64.keymap
diff --git a/app/tests/transparent/layered/native_posix.keymap b/app/tests/transparent/layered/native_posix_64.keymap
index 597ca2db78..597ca2db78 100644
--- a/app/tests/transparent/layered/native_posix.keymap
+++ b/app/tests/transparent/layered/native_posix_64.keymap
diff --git a/app/tests/transparent/normal/native_posix.keymap b/app/tests/transparent/normal/native_posix_64.keymap
index cbeb61dc47..cbeb61dc47 100644
--- a/app/tests/transparent/normal/native_posix.keymap
+++ b/app/tests/transparent/normal/native_posix_64.keymap
diff --git a/app/tests/wpm/1-single_keypress/native_posix.conf b/app/tests/wpm/1-single_keypress/native_posix_64.conf
index 360e77d5bd..360e77d5bd 100644
--- a/app/tests/wpm/1-single_keypress/native_posix.conf
+++ b/app/tests/wpm/1-single_keypress/native_posix_64.conf
diff --git a/app/tests/wpm/1-single_keypress/native_posix.keymap b/app/tests/wpm/1-single_keypress/native_posix_64.keymap
index ec12a286ca..ec12a286ca 100644
--- a/app/tests/wpm/1-single_keypress/native_posix.keymap
+++ b/app/tests/wpm/1-single_keypress/native_posix_64.keymap
diff --git a/app/tests/wpm/2-multiple_keypress/native_posix.conf b/app/tests/wpm/2-multiple_keypress/native_posix_64.conf
index f0e1a4800c..f0e1a4800c 100644
--- a/app/tests/wpm/2-multiple_keypress/native_posix.conf
+++ b/app/tests/wpm/2-multiple_keypress/native_posix_64.conf
diff --git a/app/tests/wpm/2-multiple_keypress/native_posix.keymap b/app/tests/wpm/2-multiple_keypress/native_posix_64.keymap
index f4ba2dfe1e..f4ba2dfe1e 100644
--- a/app/tests/wpm/2-multiple_keypress/native_posix.keymap
+++ b/app/tests/wpm/2-multiple_keypress/native_posix_64.keymap