Added some more conversion tests