I18n, better handling of integration tests, more int tests