fixed units
added counts to reports
fixing tests