Fix tests for extended export