Fix tests.
Lint fixes.