Make Message use correct localization function

And add test