Merge "More lint tests."