Start fixing export tests