Merge "init: refactor keychord for testing"