Adjust tests that the last commit broke.