Fixing/Adding unit tests
Adding i18n keys