Updated Converter and Tests