This test wasn't really doing anything except breaking.
Merge branch 'keyboard-rework' into fix-tests