fix wording and add more util tests