Small refactoring
Refactoring and RunReport tests