Refactor tests to make use of a shared matched_filename