Add the class of the reporter to the excel sheet.
Fix tests to reflect changes to dashboard variable generating functions