refactored all tests for exporting differant types/zones