REPORT-649 - Fixing broken tests from last commit (Allow customization of output filename)