Refactoring and cleaning in test-reporter