Fix lint and tests