Fix conversion tests