some checkstyle and one test fix