move notest check to end of shortcut_test

This amends the fix for #65 to keep all the shortcut logic in one place.

My idea for keeping shortcut logic together is that it's easier to see how the various conditions interact.  It also leaves the action subroutines cleaner, with less CPAN-specific conditional logic, which will make it easier to compare to how other clients are doing similar actions.