Add facility to test conversion, along with unit tests