Tidy for checkstyle tests