Fixed failing convert tests