Fixed lint and other test failures