Add more conversion tests