Test and chekstyle fix