Fixed wording and organization in tests