Fix test and handle ConversionException