Closes #2284. Note the changes to the test suite. In each case, a mangled external link has been fixed, so these are all positive.