Fix broken test.
Fix lint.