Adapting tests to new wording.