Fixes for all the export tests