- Improve Converter
- Some test modifications