Code refactor - Add test parameters, add reslut variable to convert method