Refactor compositeCatalogTest. Refs #9026.