test and checkstyle fixes