Fix a unit test
Fix checkstyle