changes after code-review
tests for i18n