More test methods, checkstyle changes.