From 953f5212a8c225745284bb3f86e13b1fd7505eb5 Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Thu, 24 Mar 2022 11:38:14 +0000
Subject: [PATCH] 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.
---
 app/boards/native_posix_64.conf                | 11 +++++++++++
 app/boards/native_posix_64.overlay             | 18 ++++++++++++++++++
 app/run-test.sh                                |  4 ++--
 app/src/behaviors/behavior_sticky_key.c        |  2 +-
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 .../native_posix_64.keymap                     | 17 +++++++++++++++++
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 .../native_posix_64.keymap                     | 13 +++++++++++++
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 ...{native_posix.conf => native_posix_64.conf} |  0
 ...ive_posix.keymap => native_posix_64.keymap} |  0
 179 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 app/boards/native_posix_64.conf
 create mode 100644 app/boards/native_posix_64.overlay
 rename app/tests/backlight/basic/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/backlight/basic/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/backlight/config-brt/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/backlight/config-brt/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/backlight/config-on/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/backlight/config-on/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/backlight/config-step/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/backlight/config-step/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/backlight/cycle/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/backlight/cycle/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/backlight/low-brightness/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/backlight/low-brightness/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/caps-word/continue-with-non-alpha-continue-list-item/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/caps-word/continue-with-non-modified-numeric-usage-id/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/caps-word/deactivate-by-non-alpha-non-continuation/{native_posix.keymap => native_posix_64.keymap} (100%)
 create mode 100644 app/tests/caps-word/deactivate-by-second-press/native_posix_64.keymap
 rename app/tests/combo/combos-and-holdtaps-0/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/combos-and-holdtaps-1/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/combos-and-holdtaps-2/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/layer-filter-0/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/layer-filter-1/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/multiple-timeouts/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/overlapping-combos-0/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/overlapping-combos-1/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/overlapping-combos-2/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/overlapping-combos-3/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/partially-overlapping-combos/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press-release-long-combo-complete/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press-release-long-combo-incomplete/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press-release-long-combo-wrong-last-key/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press-timeout/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press1-press2-release1-release2/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press1-press2-release2-release1/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/press1-release1-press2-release2/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/slowrelease-disabled/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/combo/slowrelease-enabled/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/conditional-layer/chained-activation/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/conditional-layer/mo-overlap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/conditional-layer/multiple-configs/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/conditional-layer/quad-layer/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/conditional-layer/tri-layer-alt-order/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/conditional-layer/tri-layer/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/gresc/gresc-press-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/gresc/gresc-two-instances/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/1-dn-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/2-dn-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/5-quick-tap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/6-retro-tap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/balanced/many-nested/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/1-dn-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/2-dn-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/5-quick-tap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/6-retro-tap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/1-dn-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/2-dn-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/5-quick-tap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/6-nested-timeouts/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/1-dn-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/key-repeat/ignore-other-usage-page-events/{native_posix.keymap => native_posix_64.keymap} (100%)
 create mode 100644 app/tests/key-repeat/press-and-release-after-key-usage/native_posix_64.keymap
 rename app/tests/key-repeat/press-and-release-with-explicit-modifiers/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/keypress/kp-press-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/macros/basic/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/macros/mo-plus-modifier-from-hold-tap/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/macros/mo-plus-modifier-macro/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/macros/press-mid-macro/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/macros/press-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/macros/timing-override/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/macros/wait-macro-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/momentary-layer/1-normal/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/momentary-layer/2-early-key-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/momentary-layer/3-covered/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/momentary-layer/4-nested/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/momentary-layer/5-nested-early-key-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/none/layered/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/1-os-dn-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/10-callum-mods/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/10-sl-sl-kp/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/8-lsk-osk-combination/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/sticky-keys/9-sk-dn-up-dn-up/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/1a-tap1/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/1b-tap2/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/1c-tap3/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/2a-hold1/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/2b-hold2/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/2c-hold3/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/3a-tap-int-mid/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/3b-tap-int-seq/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/3c-tap-int-after/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/3d-hold-int-mid/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/3e-hold-int-seq/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/3f-hold-int-after/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/4a-single/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/5a-tdint-mid/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/5b-tdint-seq/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/5c-tdint-after/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/tap-dance/5d-tdint-multiple/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/to-layer/normal/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/toggle-layer/early-key-release/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/toggle-layer/normal/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/transparent/layered/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/transparent/normal/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/wpm/1-single_keypress/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/wpm/1-single_keypress/{native_posix.keymap => native_posix_64.keymap} (100%)
 rename app/tests/wpm/2-multiple_keypress/{native_posix.conf => native_posix_64.conf} (100%)
 rename app/tests/wpm/2-multiple_keypress/{native_posix.keymap => native_posix_64.keymap} (100%)

diff --git a/app/boards/native_posix_64.conf b/app/boards/native_posix_64.conf
new file mode 100644
index 00000000..7d3e62b7
--- /dev/null
+++ b/app/boards/native_posix_64.conf
@@ -0,0 +1,11 @@
+CONFIG_KSCAN=n
+CONFIG_ZMK_KSCAN_MOCK_DRIVER=y
+CONFIG_ZMK_KSCAN_GPIO_DRIVER=n
+CONFIG_GPIO=n
+# Enable to have the native posix build expose USBIP device(s)
+# CONFIG_ZMK_USB=y
+CONFIG_LOG=y
+CONFIG_LOG_BACKEND_SHOW_COLOR=n
+CONFIG_ZMK_LOG_LEVEL_DBG=y
+CONFIG_DEBUG=y
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
diff --git a/app/boards/native_posix_64.overlay b/app/boards/native_posix_64.overlay
new file mode 100644
index 00000000..2c1ed79d
--- /dev/null
+++ b/app/boards/native_posix_64.overlay
@@ -0,0 +1,18 @@
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/kscan_mock.h>
+
+/ {
+	chosen {
+		zmk,kscan = &kscan;
+	};
+
+	kscan: kscan {
+		compatible = "zmk,kscan-mock";
+		label = "KSCAN_MOCK";
+
+		rows = <2>;
+		columns = <2>;
+		exit-after;
+	};
+};
diff --git a/app/run-test.sh b/app/run-test.sh
index da4803d6..9777f185 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -13,7 +13,7 @@ if [ $path = "all" ]; then
 	path="tests"
 fi
 
-testcases=$(find $path -name native_posix.keymap -exec dirname \{\} \;)
+testcases=$(find $path -name native_posix_64.keymap -exec dirname \{\} \;)
 num_cases=$(echo "$testcases" | wc -l)
 if [ $num_cases -gt 1 ]; then
 	echo "" > ./build/tests/pass-fail.log
@@ -26,7 +26,7 @@ fi
 testcase="$path"
 echo "Running $testcase:"
 
-west build -d build/$testcase -b native_posix -- -DZMK_CONFIG="$(pwd)/$testcase" > /dev/null 2>&1
+west build -d build/$testcase -b native_posix_64 -- -DZMK_CONFIG="$(pwd)/$testcase" > /dev/null 2>&1
 if [ $? -gt 0 ]; then
 	echo "FAILED: $testcase did not build" | tee -a ./build/tests/pass-fail.log
 	exit 1
diff --git a/app/src/behaviors/behavior_sticky_key.c b/app/src/behaviors/behavior_sticky_key.c
index 186a92d2..904a84fe 100644
--- a/app/src/behaviors/behavior_sticky_key.c
+++ b/app/src/behaviors/behavior_sticky_key.c
@@ -26,7 +26,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #define ZMK_BHV_STICKY_KEY_MAX_HELD 10
 
-#define ZMK_BHV_STICKY_KEY_POSITION_FREE ULONG_MAX
+#define ZMK_BHV_STICKY_KEY_POSITION_FREE UINT32_MAX
 
 struct behavior_sticky_key_config {
     uint32_t release_after_ms;
diff --git a/app/tests/backlight/basic/native_posix.conf b/app/tests/backlight/basic/native_posix_64.conf
similarity index 100%
rename from app/tests/backlight/basic/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/backlight/basic/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/backlight/config-brt/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/backlight/config-brt/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/backlight/config-on/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/backlight/config-on/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/backlight/config-step/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/backlight/config-step/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/backlight/cycle/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/backlight/cycle/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/backlight/low-brightness/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/backlight/low-brightness/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/caps-word/continue-with-non-alpha-continue-list-item/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/caps-word/continue-with-non-modified-numeric-usage-id/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/caps-word/deactivate-by-non-alpha-non-continuation/native_posix.keymap
rename to 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 00000000..e0695564
--- /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
similarity index 100%
rename from app/tests/combo/combos-and-holdtaps-0/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/combos-and-holdtaps-1/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/combos-and-holdtaps-2/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/layer-filter-0/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/layer-filter-1/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/multiple-timeouts/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/overlapping-combos-0/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/overlapping-combos-1/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/overlapping-combos-2/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/overlapping-combos-3/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/partially-overlapping-combos/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press-release-long-combo-complete/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press-release-long-combo-incomplete/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press-release-long-combo-wrong-last-key/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press-timeout/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press1-press2-release1-release2/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press1-press2-release2-release1/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/press1-release1-press2-release2/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/slowrelease-disabled/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/combo/slowrelease-enabled/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/conditional-layer/chained-activation/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/conditional-layer/mo-overlap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/conditional-layer/multiple-configs/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/conditional-layer/quad-layer/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/conditional-layer/tri-layer-alt-order/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/conditional-layer/tri-layer/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/gresc/gresc-press-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/gresc/gresc-two-instances/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/5-quick-tap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/6-retro-tap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/7-positional/2-dn-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/balanced/many-nested/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/5-quick-tap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/6-retro-tap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/7-positional/2-dn-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/5-quick-tap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/6-nested-timeouts/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/7-positional/2-dn-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/7-positional/4a-dn-ntgdn-timer-ntgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/7-positional/4a-dn-tgdn-timer-tgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/7-positional/tgdn-dn-ntgdn-timer-ntgup-tgup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/1-dn-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/2-dn-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/3a-moddn-dn-modup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/3b-moddn-dn-modup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/3c-kcdn-dn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/4a-dn-htdn-timer-htup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/4c-dn-kcdn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/hold-tap/tap-unless-interrupted/5-quick-tap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/key-repeat/ignore-other-usage-page-events/native_posix.keymap
rename to 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 00000000..42f6514b
--- /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
similarity index 100%
rename from app/tests/key-repeat/press-and-release-with-explicit-modifiers/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/key-repeat/send-nothing-if-no-keys-pressed-yet/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/keypress/kp-press-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/macros/basic/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/macros/mo-plus-modifier-from-hold-tap/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/macros/mo-plus-modifier-macro/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/macros/press-mid-macro/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/macros/press-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/macros/timing-override/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/macros/wait-macro-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/momentary-layer/1-normal/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/momentary-layer/2-early-key-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/momentary-layer/3-covered/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/momentary-layer/4-nested/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/none/layered/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/1-os-dn-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/10-callum-mods/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/10-sl-sl-kp/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/2-os-dn-up-kcdn-kcup-quick-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/1a-tap1/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/1b-tap2/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/1c-tap3/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/2a-hold1/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/2b-hold2/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/2c-hold3/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/3a-tap-int-mid/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/3b-tap-int-seq/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/3c-tap-int-after/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/3d-hold-int-mid/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/3e-hold-int-seq/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/3f-hold-int-after/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/4a-single/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/5a-tdint-mid/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/5b-tdint-seq/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/5c-tdint-after/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/tap-dance/5d-tdint-multiple/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/to-layer/normal/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/toggle-layer/early-key-release/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/toggle-layer/normal/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/transparent/layered/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/transparent/normal/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/wpm/1-single_keypress/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/wpm/1-single_keypress/native_posix.keymap
rename to 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
similarity index 100%
rename from app/tests/wpm/2-multiple_keypress/native_posix.conf
rename to 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
similarity index 100%
rename from app/tests/wpm/2-multiple_keypress/native_posix.keymap
rename to app/tests/wpm/2-multiple_keypress/native_posix_64.keymap