Fix lint and failing tests.