Remaining manual lint fixes; add test target.