Lint files in utils.
Fixed failing tests.