Fixed export tags for tests