Fix converters and tests