Fixed tests to handle newly named links