Fixing failing tests from change to deal with multiple file extensions