Test for link swap options
Rearrange some code to eke out some speed
Fix up tests hitting broken links

Previously this would crash