Added converter and converter test