Fix checkstyle.
Add more tests.