Correct some tests according to changes.