diff --git a/snprc_ehr/resources/queries/study/PotentialSires.sql b/snprc_ehr/resources/queries/study/PotentialSires.sql
index 6b6c2bc6c..07c43939c 100644
--- a/snprc_ehr/resources/queries/study/PotentialSires.sql
+++ b/snprc_ehr/resources/queries/study/PotentialSires.sql
@@ -4,7 +4,7 @@ PARAMETERS
     selectedOptionParm VARCHAR DEFAULT 'Birth'  -- Birth or Acquisition
 )
 -- TODO: Do we want to limit selection to animals that were co-located with dam?
-SELECT d.id as Sire,
+SELECT distinct d.id as Sire,
        d.species as Species,
        d.species.arc_species_code as ArcSpeciesCode,
        d.gender as Gender,
@@ -39,7 +39,7 @@ FROM study.demographics AS d
     UNION ALL
     SELECT 185 as gestation, timestampadd('SQL_TSI_DAY', -185, birthdateParm ) as minConceptionDate, 'O' as species
 ) AS y ON CASE WHEN d.species.arc_species_code IN ('PC', 'CJ', 'MM', 'MF', 'PT','MA') then d.species.arc_species_code ELSE 'O' END = y.species
-         INNER JOIN study.acq_disp as ad on d.id = ad.id
+INNER JOIN study.acq_disp as ad on d.id = ad.id
 WHERE d.gender = 'M'
 -- age at conception is greater or equal to minimum adult age
   -- LK has trouble matching parameters correctly using the code below, so minConceptionDate was added to the y result set
diff --git a/snprc_ehr/src/client/NewAnimalPage/NewAnimalPage.jsx b/snprc_ehr/src/client/NewAnimalPage/NewAnimalPage.jsx
index 13ec3c4d4..1a58c2f9c 100644
--- a/snprc_ehr/src/client/NewAnimalPage/NewAnimalPage.jsx
+++ b/snprc_ehr/src/client/NewAnimalPage/NewAnimalPage.jsx
@@ -107,8 +107,6 @@ loadListsForSpecies = selectedSpecies => {
     const lists = {}
 
     async function loadListsAW(species) {
-      // lists.potentialDamList = await fetchPotentialDams(species)
-      // lists.potentialSireList = await fetchPotentialSires(species)
       lists.locationList = await fetchLocations(species)
       lists.colonyList = await fetchColonies(species)
       lists.iacucList = await fetchProtocols(species)
@@ -119,8 +117,6 @@ loadListsForSpecies = selectedSpecies => {
       .then(() => {
         this.setState(prevState => ({
           ...prevState,
-          // potentialDamList: lists.potentialDamList,
-          // potentialSireList: lists.potentialSireList,
           locationList: lists.locationList,
           colonyList: lists.colonyList,
           iacucList: lists.iacucList,
@@ -439,7 +435,6 @@ reloadDamsAndSires = (selectedSpecies, birthdate, selectedOption) => {
       lists.potentialDamList = await fetchPotentialDams(speciesValue, birthdateValue, selectedOptionValue)
       lists.potentialSireList = await fetchPotentialSires(speciesValue, birthdateValue, selectedOptionValue)
     }
-
     loadListsAW(selectedSpecies.arcSpeciesCode, birthdate.date, selectedOption)
       .then(() => {
         this.setState(prevState => ({
@@ -508,6 +503,7 @@ render() {
                     acquisitionTypeList={
                       this.state.acquisitionTypeList
                     }
+                    debug={ this.debug }
                     disabled={ this.disableFirstPanel() }
                     handleDataChange={ this.handleDataChange }
                     handleNumAnimalChange={ this.handleNumAnimalChange }
@@ -535,6 +531,7 @@ render() {
                 >
                   <DemographicsPanel
                     bdStatusList={ this.state.bdStatusList }
+                    debug={ this.debug }
                     disabled={ this.disablePanels() }
                     handleDataChange={ this.handleDataChange }
                     newAnimalData={ this.state.newAnimalData }
diff --git a/snprc_ehr/src/client/NewAnimalPage/components/AcquisitionPanel.jsx b/snprc_ehr/src/client/NewAnimalPage/components/AcquisitionPanel.jsx
index be6279033..5a5384556 100644
--- a/snprc_ehr/src/client/NewAnimalPage/components/AcquisitionPanel.jsx
+++ b/snprc_ehr/src/client/NewAnimalPage/components/AcquisitionPanel.jsx
@@ -3,10 +3,11 @@ import Select from 'react-select'
 import moment from 'moment'
 import WrappedDatePicker from '../../Shared/components/WrappedDatePicker'
 import InfoPanel from '../../Shared/components/InfoPanel'
-import { validateNumAnimals } from '../services/validation'
+import { validateNumAnimals, isFutureDate } from '../services/validation'
 import constants from '../constants/index'
 
 export default class AcquisitionPanel extends React.Component {
+  dateErrorMessageText = 'Future dates are not allowed.'
   state = {
     errorMessage: undefined,
     infoMessage: undefined
@@ -18,7 +19,14 @@ handleAcquisitionChange = option => {
     this.props.handleDataChange('acquisitionType', option)
   }
 handleAcquisitionDateChange = date => {
-    this.props.handleDataChange('acqDate', { date: moment(date) })
+  const acqDate = moment(date)
+  const dateStatus = isFutureDate(acqDate) || this.props.debug // debug is triggered by test suite
+    if (dateStatus) {
+      this.props.handleDataChange('acqDate', { date: acqDate })
+    }
+    this.setState(() => ({
+      errorMessage: dateStatus ? undefined : this.dateErrorMessageText
+    }))
   }
 handleSourceLocationChange = sourceLocation => {
     this.props.handleDataChange('sourceLocation', sourceLocation)
@@ -102,6 +110,7 @@ render() {
                   className="shared-dropdown"
                   classNamePrefix="shared-select"
                   id="location-select"
+                  isClearable
                   isDisabled={ this.props.disabled }
                   isLoading={ this.props.sourceLocationList.length === 0 }
                   onChange={ this.handleSourceLocationChange }
diff --git a/snprc_ehr/src/client/NewAnimalPage/components/DemographicsPanel.jsx b/snprc_ehr/src/client/NewAnimalPage/components/DemographicsPanel.jsx
index 86b47f358..8fe7600f9 100644
--- a/snprc_ehr/src/client/NewAnimalPage/components/DemographicsPanel.jsx
+++ b/snprc_ehr/src/client/NewAnimalPage/components/DemographicsPanel.jsx
@@ -37,12 +37,15 @@ handleGenderChange = option => {
 handleBirthDateChange = date => {
     const { selectedOption } = this.props
     const { species, acqDate } = this.props.newAnimalData
-    const birthdate = moment(date)
-
-    this.props.handleDataChange('birthDate', { date: birthdate })
+    const birthDate = moment(date)
+    const bdStatus = isBirthdateValid(birthDate, acqDate.date) || this.props.debug // debug is triggered by test suite
+    if (bdStatus) {
+      this.props.handleDataChange('birthDate', { date: birthDate })
+      this.props.reloadDamsAndSires(species, { date: birthDate }, selectedOption)
+    }
     this.setState(() => ({
-        errorMessage: isBirthdateValid(birthdate, acqDate.date) ? undefined : this.dateErrorMessageText
-      }), () => { this.props.reloadDamsAndSires(species, birthdate, selectedOption) })
+      errorMessage: bdStatus ? undefined : this.dateErrorMessageText
+    }))
 }
 handleBirthDateSelect = () => {
     // do nothing
diff --git a/snprc_ehr/src/client/NewAnimalPage/services/validation.js b/snprc_ehr/src/client/NewAnimalPage/services/validation.js
index 1c62f543f..0a991224a 100644
--- a/snprc_ehr/src/client/NewAnimalPage/services/validation.js
+++ b/snprc_ehr/src/client/NewAnimalPage/services/validation.js
@@ -2,7 +2,13 @@ import moment from 'moment'
 
 export const isBirthdateValid = (birthdate, acqDate) => {
     return (
-        moment(birthdate).isSameOrBefore(moment(acqDate))
+        birthdate.isSameOrBefore(acqDate)
+    )
+}
+
+export const isFutureDate = date => {
+    return (
+        date.isSameOrBefore(moment())
     )
 }
 
diff --git a/snprc_ehr/src/client/NewAnimalPage/tests/__snapshots__/NewAnimalPage.test.jsx.snap b/snprc_ehr/src/client/NewAnimalPage/tests/__snapshots__/NewAnimalPage.test.jsx.snap
index 864996d60..1657ec817 100644
--- a/snprc_ehr/src/client/NewAnimalPage/tests/__snapshots__/NewAnimalPage.test.jsx.snap
+++ b/snprc_ehr/src/client/NewAnimalPage/tests/__snapshots__/NewAnimalPage.test.jsx.snap
@@ -103,6 +103,7 @@ exports[`NewAnimalPage tests Should render Species/Acquisition page after lists
         >
           <AcquisitionPanel
             acquisitionTypeList={Array []}
+            debug={true}
             disabled={true}
             handleDataChange={[Function]}
             handleNumAnimalChange={[Function]}
@@ -408,7 +409,7 @@ exports[`NewAnimalPage tests Should render demographics page 1`] = `
       >
         <div
           className="panel-heading"
-          disabled={true}
+          disabled={false}
         >
           <p>
             Demographics
@@ -416,7 +417,7 @@ exports[`NewAnimalPage tests Should render demographics page 1`] = `
         </div>
         <div
           className="wizard-panel"
-          disabled={true}
+          disabled={false}
         >
           <DemographicsPanel
             bdStatusList={
@@ -438,7 +439,8 @@ exports[`NewAnimalPage tests Should render demographics page 1`] = `
                 },
               ]
             }
-            disabled={true}
+            debug={true}
+            disabled={false}
             handleDataChange={[Function]}
             newAnimalData={
               Object {
@@ -557,16 +559,6 @@ exports[`NewAnimalPage tests Should render demographics page 1`] = `
           />
         </div>
       </div>
-      <InfoPanel
-        errorMessages={
-          Array [
-            Object {
-              "colName": "Cannot read property 'value' of undefined",
-              "propTest": true,
-            },
-          ]
-        }
-      />
       <div>
         <Pager
           bsClass="pager"
@@ -803,7 +795,7 @@ exports[`Should render Account page 1`] = `
       >
         <div
           className="panel-heading"
-          disabled={true}
+          disabled={false}
         >
           <p>
             Account, Colony, and Ownership
@@ -811,7 +803,7 @@ exports[`Should render Account page 1`] = `
         </div>
         <div
           className="wizard-panel"
-          disabled={true}
+          disabled={false}
         >
           <AccountPanel
             accountList={
@@ -833,10 +825,58 @@ exports[`Should render Account page 1`] = `
                 },
               ]
             }
-            colonyList={Array []}
-            disabled={true}
+            colonyList={
+              Array [
+                Object {
+                  "Category": 7,
+                  "id": 0,
+                  "label": "pc_Conv",
+                  "species": "PC",
+                  "value": 214,
+                },
+                Object {
+                  "Category": 7,
+                  "id": 1,
+                  "label": "pc_SPF",
+                  "species": "PC",
+                  "value": 213,
+                },
+                Object {
+                  "Category": 42,
+                  "id": 2,
+                  "label": "pc_Whatever",
+                  "species": "PC",
+                  "value": 215,
+                },
+              ]
+            }
+            disabled={false}
             handleDataChange={[Function]}
-            iacucList={Array []}
+            iacucList={
+              Array [
+                Object {
+                  "id": 0,
+                  "label": "1134PC - Nathanielsz, P. -Maternal Nutrient Restriction:  Placental and Fetal Brain and Kidney Outcomes",
+                  "maxAnimals": 0,
+                  "species": "PC",
+                  "value": "1134PC",
+                },
+                Object {
+                  "id": 1,
+                  "label": "1272PC - Chen, Christopher -Baboon Model of Liver Cancer",
+                  "maxAnimals": 8,
+                  "species": "PC",
+                  "value": "1272PC",
+                },
+                Object {
+                  "id": 2,
+                  "label": "1497PC - Giavedoni, L. -Natural Resistance of baboon cells to SIV infection",
+                  "maxAnimals": 60,
+                  "species": "PC",
+                  "value": "1497PC",
+                },
+              ]
+            }
             institutionList={
               Array [
                 Object {
@@ -899,21 +939,35 @@ exports[`Should render Account page 1`] = `
                 },
               }
             }
-            pedigreeList={Array []}
+            pedigreeList={
+              Array [
+                Object {
+                  "Category": 2,
+                  "id": 0,
+                  "label": "baboon1",
+                  "species": "PC",
+                  "value": 31,
+                },
+                Object {
+                  "Category": 2,
+                  "id": 1,
+                  "label": "baboon2",
+                  "species": "PC",
+                  "value": 32,
+                },
+                Object {
+                  "Category": 2,
+                  "id": 2,
+                  "label": "baboon3",
+                  "species": "PC",
+                  "value": 33,
+                },
+              ]
+            }
             preventNext={[Function]}
           />
         </div>
       </div>
-      <InfoPanel
-        errorMessages={
-          Array [
-            Object {
-              "colName": "Cannot read property 'value' of undefined",
-              "propTest": true,
-            },
-          ]
-        }
-      />
       <div>
         <Pager
           bsClass="pager"
@@ -1131,7 +1185,7 @@ exports[`Should render Diet page 1`] = `
       >
         <div
           className="panel-heading"
-          disabled={true}
+          disabled={false}
         >
           <p>
             Diet
@@ -1139,7 +1193,7 @@ exports[`Should render Diet page 1`] = `
         </div>
         <div
           className="wizard-panel"
-          disabled={true}
+          disabled={false}
         >
           <DietPanel
             dietList={
@@ -1164,7 +1218,7 @@ exports[`Should render Diet page 1`] = `
                 },
               ]
             }
-            disabled={true}
+            disabled={false}
             handleDataChange={[Function]}
             newAnimalData={
               Object {
@@ -1213,16 +1267,6 @@ exports[`Should render Diet page 1`] = `
           />
         </div>
       </div>
-      <InfoPanel
-        errorMessages={
-          Array [
-            Object {
-              "colName": "Cannot read property 'value' of undefined",
-              "propTest": true,
-            },
-          ]
-        }
-      />
       <div>
         <Pager
           bsClass="pager"
@@ -1440,7 +1484,7 @@ exports[`Should render Location page 1`] = `
       >
         <div
           className="panel-heading"
-          disabled={true}
+          disabled={false}
         >
           <p>
             Location
@@ -1448,13 +1492,40 @@ exports[`Should render Location page 1`] = `
         </div>
         <div
           className="wizard-panel"
-          disabled={true}
+          disabled={false}
         >
           <LocationPanel
-            disabled={true}
+            disabled={false}
             handleDataChange={[Function]}
             handleError={[Function]}
-            locationList={Array []}
+            locationList={
+              Array [
+                Object {
+                  "arcSpeciesCode": "PC",
+                  "id": 0,
+                  "label": "1.01 - Test location 1",
+                  "maxCages": null,
+                  "rowId": 4201,
+                  "value": "1.01",
+                },
+                Object {
+                  "arcSpeciesCode": "PC",
+                  "id": 1,
+                  "label": "2.00 - Test location 2",
+                  "maxCages": 12,
+                  "rowId": 4202,
+                  "value": "2.00",
+                },
+                Object {
+                  "arcSpeciesCode": "PC",
+                  "id": 2,
+                  "label": "6.06 - Test location 3",
+                  "maxCages": 15,
+                  "rowId": 4203,
+                  "value": "6.06",
+                },
+              ]
+            }
             newAnimalData={
               Object {
                 "acqDate": Object {
@@ -1502,16 +1573,6 @@ exports[`Should render Location page 1`] = `
           />
         </div>
       </div>
-      <InfoPanel
-        errorMessages={
-          Array [
-            Object {
-              "colName": "Cannot read property 'value' of undefined",
-              "propTest": true,
-            },
-          ]
-        }
-      />
       <div>
         <Pager
           bsClass="pager"
diff --git a/snprc_ehr/src/client/NewAnimalPage/tests/fixtures/apiTestData.js b/snprc_ehr/src/client/NewAnimalPage/tests/fixtures/apiTestData.js
index 26efbb60d..73c8de944 100644
--- a/snprc_ehr/src/client/NewAnimalPage/tests/fixtures/apiTestData.js
+++ b/snprc_ehr/src/client/NewAnimalPage/tests/fixtures/apiTestData.js
@@ -333,6 +333,9 @@ export const ActiveLocationsAll = {
             },
             rowId: {
                 value: 4201
+            },
+            description: {
+                value: 'Test location 1'
             }
         }
     }, {
@@ -349,6 +352,9 @@ export const ActiveLocationsAll = {
             },
             rowId: {
                 value: 4202
+            },
+            description: {
+                value: 'Test location 2'
             }
         }
     }, {
@@ -365,6 +371,9 @@ export const ActiveLocationsAll = {
             },
             rowId: {
                 value: 4203
+            },
+            description: {
+                value: 'Test location 3'
             }
         }
     }],