updated Convertor

added Unit Tests