Improved ExporterTest
Merge pull request #1626 from pulzarraider/exporter_test

Improved ExporterTest