Conversion and some more tests