Update the tests for Org to Org exporter