Add tests and intl