Simplifying code in ZincCatalogsTest