Converter done, tests fixed