issue #19444: tweaks to export test