Correct broken tests