Eng 4513

Fix quarantined export tests broken by elastic work