More translation conversions, fixed tests