Fix test to account for extra columns. Update matcher due to mockito 5

src/test/java/edu/unc/lib/boxc/migration/cdm/services/CdmFieldServiceTest.java

@@ -3,7 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 

src/test/java/edu/unc/lib/boxc/migration/cdm/services/FieldAssessmentTemplateServiceTest.java

@@ -53,7 +53,7 @@ public void allExpectedCellsPopulatedTest() throws Exception {
         XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
         Sheet sheet = workbook.getSheetAt(0);
 
-        assertEquals(60, sheet.getLastRowNum());
+        assertEquals(62, sheet.getLastRowNum());
         assertEquals(16, sheet.getRow(0).getPhysicalNumberOfCells());
         assertEquals(12, sheet.getRow(1).getPhysicalNumberOfCells());
         assertEquals(12, sheet.getRow(60).getPhysicalNumberOfCells());