Refactoring and unit test for exporters - Incomplete