FIX: Better keypress testing