diff --git a/Makefile b/Makefile
index 2e1bc2e..1b89345 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,14 @@ $(TARGET): $(DEPS)
 
 .PHONY: clean
 clean:
-	rm $(TARGET) 
+	rm $(TARGET)
 
 .PHONY: init
 init:
 	git submodule init
 	git submodule update
-	git submodule foreach git pull origin master 
+	git submodule foreach git pull origin master
+	git submodule foreach make
 
 
 .PHONY: test mocha
diff --git a/tests.lst b/tests.lst
index 7fa2335..a806a30 100644
--- a/tests.lst
+++ b/tests.lst
@@ -1,108 +1,125 @@
-45430.xlsx
-45540_classic_Footer.xlsx
-45540_classic_Header.xlsx
-45540_form_Footer.xlsx
-45540_form_Header.xlsx
-45544.xlsx
-46535.xlsx
-46536.xlsx
-47090.xlsx
-47504.xlsx
-47668.xlsx
-47737.xlsx
-47804.xlsx
-47813.xlsx.pending
-47862.xlsx
-47889.xlsx
-48495.xlsx
-48539.xlsx
-48703.xlsx
-48779.xlsx
-48923.xlsx
-49156.xlsx
-49273.xlsx
-49325.xlsx
-49609.xlsx
-49783.xlsx
-49872.xlsx
-49928.xlsx
-49966.xlsx
-50096.xlsx
-50299.xlsx
-50784-font_theme_colours.xlsx
-50786-indexed_colours.xlsx
-50795.xlsx
-50846-border_colours.xlsx
-50867_with_table.xlsx
-51222.xlsx
-51470.xlsx
-51710.xlsx
-51850.xlsx
-51963.xlsx
-52348.xlsx
-52716.xlsx
-53101.xlsx
-53282.xlsx
-53568.xlsx
-53734.xlsx
-53798.xlsx
-53798_shiftNegative_TMPL.xlsx
-54071.xlsx
-54084 - Greek - beyond BMP.xlsx
-54206.xlsx
-54288-ref.xlsx
-54288.xlsx
-54436.xlsx
-54524.xlsx
-54607.xlsx
-55640.xlsx
-55745.xlsx
-55850.xlsx
-AverageTaxRates.xlsx
-Booleans.xlsx
-BrNotClosed.xlsx
-CustomXMLMapping-singleattributenamespace.xlsx
-CustomXMLMappings-complex-type.xlsx
-CustomXMLMappings.xlsx
-CustomXmlMappings-inverse-order.xlsx
-DataValidations-49244.xlsx
-DateFormatTests.xlsx
-ElapsedFormatTests.xlsx
-ForShifting.xlsx
-FormatChoiceTests.xlsx
-FormatConditionTests.xlsx
-Formatting.xlsx
-FormulaEvalTestData_Copy.xlsx
-GeneralFormatTests.xlsx
-GroupTest.xlsx
-InlineStrings.xlsx
-NewlineInFormulas.xlsx
-NumberFormatApproxTests.xlsx
-NumberFormatTests.xlsx
-RepeatingRowsCols.xlsx
-SampleSS.xlsx
-ShrinkToFit.xlsx
-SimpleMultiCell.xlsx
-SimpleWithComments.xlsx
-Tables.xlsx
-TextFormatTests.xlsx
-TwoSheetsNoneHidden.xlsx
-TwoSheetsOneHidden.xlsx
-WithChart.xlsx
-WithChartSheet.xlsx.pending
-WithConditionalFormatting.xlsx
-WithDrawing.xlsx
-WithEmbeded.xlsx
-WithMoreVariousData.xlsx
-WithTable.xlsx
-WithTextBox.xlsx
-WithTextBox2.xlsx
-WithThreeCharts.xlsx
-WithTwoCharts.xlsx
-WithVariousData.xlsx
-atp.xlsx
-chart_sheet.xlsx.pending
-comments.xlsx
+LONumbers-2010.xlsx
+LONumbers-2011.xlsx
+LONumbers.xlsx
+apachepoi_45430.xlsx
+apachepoi_45540_classic_Footer.xlsx
+apachepoi_45540_classic_Header.xlsx
+apachepoi_45540_form_Footer.xlsx
+apachepoi_45540_form_Header.xlsx
+apachepoi_45544.xlsx
+apachepoi_46535.xlsx
+apachepoi_46536.xlsx
+apachepoi_47090.xlsx
+apachepoi_47504.xlsx
+apachepoi_47668.xlsx
+apachepoi_47737.xlsx
+apachepoi_47804.xlsx
+apachepoi_47813.xlsx.pending
+apachepoi_47862.xlsx
+apachepoi_47889.xlsx
+apachepoi_48495.xlsx
+apachepoi_48539.xlsx
+apachepoi_48703.xlsx
+apachepoi_48779.xlsx
+apachepoi_48923.xlsx
+apachepoi_49156.xlsx
+apachepoi_49273.xlsx
+apachepoi_49325.xlsx
+apachepoi_49609.xlsx
+apachepoi_49783.xlsx
+apachepoi_49872.xlsx
+apachepoi_49928.xlsx
+apachepoi_49966.xlsx
+apachepoi_50096.xlsx
+apachepoi_50299.xlsx
+apachepoi_50784-font_theme_colours.xlsx
+apachepoi_50786-indexed_colours.xlsx
+apachepoi_50795.xlsx
+apachepoi_50846-border_colours.xlsx
+apachepoi_50867_with_table.xlsx
+apachepoi_51222.xlsx
+apachepoi_51470.xlsx
+apachepoi_51710.xlsx
+apachepoi_51850.xlsx
+apachepoi_51963.xlsx
+apachepoi_52348.xlsx
+apachepoi_52716.xlsx
+apachepoi_53101.xlsx
+apachepoi_53282.xlsx
+apachepoi_53568.xlsx
+apachepoi_53734.xlsx
+apachepoi_53798.xlsx
+apachepoi_53798_shiftNegative_TMPL.xlsx
+apachepoi_54071.xlsx
+apachepoi_54084 - Greek - beyond BMP.xlsx
+apachepoi_54206.xlsx
+apachepoi_54288-ref.xlsx
+apachepoi_54288.xlsx
+apachepoi_54436.xlsx
+apachepoi_54524.xlsx
+apachepoi_54607.xlsx
+apachepoi_55640.xlsx
+apachepoi_55745.xlsx
+apachepoi_55850.xlsx
+apachepoi_AverageTaxRates.xlsx
+apachepoi_Booleans.xlsx
+apachepoi_BrNotClosed.xlsx
+apachepoi_CustomXMLMapping-singleattributenamespace.xlsx
+apachepoi_CustomXMLMappings-complex-type.xlsx
+apachepoi_CustomXMLMappings.xlsx
+apachepoi_CustomXmlMappings-inverse-order.xlsx
+apachepoi_DataValidations-49244.xlsx
+apachepoi_DateFormatTests.xlsx
+apachepoi_ElapsedFormatTests.xlsx
+apachepoi_ForShifting.xlsx
+apachepoi_FormatChoiceTests.xlsx
+apachepoi_FormatConditionTests.xlsx
+apachepoi_Formatting.xlsx
+apachepoi_FormulaEvalTestData_Copy.xlsx
+apachepoi_GeneralFormatTests.xlsx
+apachepoi_GroupTest.xlsx
+apachepoi_InlineStrings.xlsx
+apachepoi_NewlineInFormulas.xlsx
+apachepoi_NumberFormatApproxTests.xlsx
+apachepoi_NumberFormatTests.xlsx
+apachepoi_RepeatingRowsCols.xlsx
+apachepoi_SampleSS.xlsx
+apachepoi_ShrinkToFit.xlsx
+apachepoi_SimpleMultiCell.xlsx
+apachepoi_SimpleWithComments.xlsx
+apachepoi_Tables.xlsx
+apachepoi_TextFormatTests.xlsx
+apachepoi_TwoSheetsNoneHidden.xlsx
+apachepoi_TwoSheetsOneHidden.xlsx
+apachepoi_WithChart.xlsx
+apachepoi_WithChartSheet.xlsx.pending
+apachepoi_WithConditionalFormatting.xlsx
+apachepoi_WithDrawing.xlsx
+apachepoi_WithEmbeded.xlsx
+apachepoi_WithMoreVariousData.xlsx
+apachepoi_WithTable.xlsx
+apachepoi_WithTextBox.xlsx
+apachepoi_WithTextBox2.xlsx
+apachepoi_WithThreeCharts.xlsx
+apachepoi_WithTwoCharts.xlsx
+apachepoi_WithVariousData.xlsx
+apachepoi_atp.xlsx
+apachepoi_chart_sheet.xlsx.pending
+apachepoi_comments.xlsx
+apachepoi_picture.xlsx
+apachepoi_reordered_sheets.xlsx
+apachepoi_sample-beta.xlsx.pending
+apachepoi_sample.xlsx
+apachepoi_shared_formulas.xlsx
+apachepoi_sheetProtection_allLocked.xlsx
+apachepoi_sheetProtection_not_protected.xlsx
+apachepoi_styles.xlsx
+apachepoi_workbookProtection_not_protected.xlsx
+apachepoi_workbookProtection_workbook_revision_protected.xlsx
+apachepoi_workbookProtection_workbook_structure_protected.xlsx
+apachepoi_workbookProtection_workbook_windows_protected.xlsx
+apachepoi_workbookProtection_worksheet_protected.xlsx
+apachepoi_xlsx-jdbc.xlsx
 excel-reader-xlsx_data01.xlsx
 excel-reader-xlsx_data02.xlsx
 excel-reader-xlsx_error02.xlsx.pending
@@ -122,6 +139,7 @@ jxls-core_simple.xlsx
 jxls-examples_stress1.xlsx
 jxls-examples_stress2.xlsx
 jxls-reader_departmentData.xlsx
+merge_cells.xlsx
 mixed_sheets.xlsx
 named_ranges_2011.xlsx
 openpyxl_g_NameWithValueBug.xlsx
@@ -134,6 +152,7 @@ openpyxl_g_empty_with_no_properties.xlsx.pending
 openpyxl_g_guess_types.xlsx
 openpyxl_g_libreoffice_nrt.xlsx
 openpyxl_g_merge_range.xlsx
+openpyxl_r_comments.xlsx
 openpyxl_r_complex-styles.xlsx
 openpyxl_r_conditional-formatting.xlsx
 openpyxl_r_contains_chartsheets.xlsx.pending
@@ -142,20 +161,46 @@ openpyxl_r_date_1904.xlsx
 openpyxl_r_formulae.xlsx
 openpyxl_r_null_archive.xlsx.pending
 openpyxl_r_null_file.xlsx.pending
-picture.xlsx
-reordered_sheets.xlsx
-sample-beta.xlsx.pending
-sample.xlsx
-shared_formulas.xlsx
-sheetProtection_allLocked.xlsx
-sheetProtection_not_protected.xlsx
-styles.xlsx
-workbookProtection_not_protected.xlsx
-workbookProtection_workbook_revision_protected.xlsx
-workbookProtection_workbook_structure_protected.xlsx
-workbookProtection_workbook_windows_protected.xlsx
-workbookProtection_worksheet_protected.xlsx
+roo_1900_base.xlsx
+roo_1904_base.xlsx
+roo_Bibelbund.xlsx
+roo_Pfand_from_windows_phone.xlsx.pending
+roo_bbu.xlsx
+roo_boolean.xlsx
+roo_borders.xlsx
+roo_bug-numbered-sheet-names.xlsx.pending
+roo_comments.xlsx
+roo_datetime.xlsx
+roo_emptysheets.xlsx
+roo_file_item_error.xlsx
+roo_formula.xlsx
+roo_formula_string_error.xlsx
+roo_link.xlsx
+roo_named_cells.xlsx
+roo_numbers1.xlsx
+roo_numeric-link.xlsx
+roo_only_one_sheet.xlsx
+roo_paragraph.xlsx
+roo_simple_spreadsheet.xlsx
+roo_style.xlsx
+roo_time-test.xlsx
+roo_type_excel.xlsx.pending
+roo_type_openoffice.xlsx.pending
+roo_whitespace.xlsx
+spreadsheet-parsexlsx_Test.xlsx
+spreadsheet-parsexlsx_bug-10.xlsx
+spreadsheet-parsexlsx_bug-11.xlsx
+spreadsheet-parsexlsx_bug-12.xlsx
+spreadsheet-parsexlsx_bug-13.xlsx
+spreadsheet-parsexlsx_bug-14.xlsx
+spreadsheet-parsexlsx_bug-2.xlsx
+spreadsheet-parsexlsx_bug-3.xlsx
+spreadsheet-parsexlsx_bug-4.xlsx
+spreadsheet-parsexlsx_bug-5.xlsx
+spreadsheet-parsexlsx_bug-6-2.xlsx
+spreadsheet-parsexlsx_bug-6.xlsx
+spreadsheet-parsexlsx_bug-7.xlsx
+spreadsheet-parsexlsx_bug-8.xlsx
 xlrd_reveng1.xlsx
 xlrd_text_bar.xlsx
-xlsx-jdbc.xlsx
 חישוב_נקודות_זיכוי.xlsx
diff --git a/tests/files b/tests/files
index 9c0f02f..3bcc12b 160000
--- a/tests/files
+++ b/tests/files
@@ -1 +1 @@
-Subproject commit 9c0f02fe3a2c682ec5b1a2285b9f976902284b87
+Subproject commit 3bcc12b1d249f9bec2e00d18ab52d3fcaa5375e2