More test coverage in utils