Update test case
Refactor converters

Thanks to [@wzpan](http://redcloth.org/hobix.com/textile/)