Merge "Refactor keyboard layout unit tests"