checkstyle and one test fix