shortcut tests refactored