Checkstyle fixes and a flaky test