split out shortcut tests to match code
remove dead code