add test, little refactor and start convert command