Correct tests according to comments