fix mapping names
fix column at multibyte test