Adjust tests according to recent commits.