expanded list comprehension for readability; updated xls/xlsx tests