Checkstyle and test fixes.