Fix catalog tree tests