adjustments to export, expr. tests