test, checkstyle fixes