Partial hr i18n
Fixed tests