Merge pull request #471 from jonohart/fixtests

Fixed unit tests that failed after recent link discovery bug fix