Refactoring extraction test to test against both files we have.