Changed structure and content of exporteur tests.