Fix tests after Converter changes.