more tests, fix additional modifications, i18n implementations