Improve Conversion and Format tests