Fix test convenience function and change hotkey