Improve new conversion tests