fixup! Fix acceptance tests given latest changes to exporter