JAL-3468 i18n and additional unit tests