updated Convertor

added more unit tests