Improve utils test coverage