Fix catalog usage in unit tests