Improve test coverage for utilities.