Fix used files/companion file reporting

The pattern file should now be correctly included in the used file list.
Update used file tests for FilePatternReader