Fix keyboard test in v2.1