Internationalization support
unit test fixes