Improve tests for links and reduce testing clutter