diff --git a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
index 03d6f463..00e81d9b 100644
--- a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
+++ b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
@@ -582,6 +582,8 @@ public void testBirthForm()
         births.setGridCellJS(1, "date", now.minusDays(1).format(DateTimeFormatter.ofPattern(DATE_TIME_FORMAT_STRING)));
         births.setGridCell(1, "Id", bornAnimal);
         births.setGridCell(1, "cage", "C3");
+        births.setGridCell(1, "Id/demographics/species", "Cebus apella CAP");
+        births.setGridCell(1, "Id/demographics/gender", "female");
         births.setGridCell(1, "project", "795644");
         births.setGridCell(1, "birthProtocol", "protocol101");
         submitForm("Submit Final", "Finalize");
@@ -1307,7 +1309,8 @@ private void verifyOrchardFileGenerated(String animalId)
     private void submitForm(String buttonText, String windowTitle)
     {
         //Give time for errors to disappear after validation
-        longWait().until(ExpectedConditions.invisibilityOfElementWithText(Locator.tag("div"), "The form has the following errors and warnings:"));
+        Locator.tagContainingText("div", "The form has the following errors and warnings:")
+                .waitForElementToDisappear(longWait());
         Locator submitFinalBtn = Locator.linkWithText(buttonText);
         shortWait().until(ExpectedConditions.elementToBeClickable(submitFinalBtn));
         Window<?> msgWindow;