Fix tests/lint pass.