Added new initial test report output + refactor / clean the code