Fix failing catalog controller tests
Fix failing ingest batch model test