Reorder and add data files for testing.