Improve conversion tests