First phase of refactoring reporting test cases.