fixing OptionsShortcut as I add more tests