Use the new email field

Also update tests to use the new export form.