Expand coverage for utils