Fix some cases where file handles are not closed in OldExcelExtractor Close resources in some more tests to make the file-leak report clean again