reporter tests refactoring