Slight changes in tests and links