fix lint and tests