several fixes to the new conversion functions and tests