LINK updates plus small bug fix in a test originally submitted by Microsoft