Introduce Shortcut and finally fix all tests in Firefox