Prd 4692 - Fixing test cases, no functional changes otherwise

This fixes the test cases that are currently failing in git-reporting-libraries.