added additional conversions and tests