change ReportUtil and added test for it