refactor reporting, create reporting tests